Revert "Experimental HMAC-SHA1 implementation"

We don't really want to support it, and it's slower than GHASH...

This reverts commit 9bf498263765328011ee105e5e7b3e1cc1b2bc3f.

5 files changed, 0 insertions, 144 deletions

diff --git a/src/crypto/mac/CMakeLists.txt b/src/crypto/mac/CMakeLists.txt
index 77c813b..971c04b 100644
--- a/src/crypto/mac/CMakeLists.txt
+++ b/src/crypto/mac/CMakeLists.txt
@@ -60,7 +60,6 @@ endmacro(fastd_mac_impl_compile_flags)
 
 
 add_subdirectory(ghash)
-add_subdirectory(hmac_sha1)
 
 
 set(MAC_DEFINITIONS "")
diff --git a/src/crypto/mac/hmac_sha1/CMakeLists.txt b/src/crypto/mac/hmac_sha1/CMakeLists.txt
deleted file mode 100644
index 10f0d35..0000000
--- a/src/crypto/mac/hmac_sha1/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-fastd_mac(hmac-sha1 hmac_sha1.c)
-add_subdirectory(openssl)
diff --git a/src/crypto/mac/hmac_sha1/hmac_sha1.c b/src/crypto/mac/hmac_sha1/hmac_sha1.c
deleted file mode 100644
index 8d44017..0000000
--- a/src/crypto/mac/hmac_sha1/hmac_sha1.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  Copyright (c) 2012-2014, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
-   \file
-
-   General information about the HMAC-SHA1 algorithm
-*/
-
-#include "../../../crypto.h"
-
-
-/** MAC info about the HMAC-SHA1 algorithm */
-const fastd_mac_info_t fastd_mac_info_hmac_sha1 = {
-	.key_length = 64,
-};
diff --git a/src/crypto/mac/hmac_sha1/openssl/CMakeLists.txt b/src/crypto/mac/hmac_sha1/openssl/CMakeLists.txt
deleted file mode 100644
index cb08c58..0000000
--- a/src/crypto/mac/hmac_sha1/openssl/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-if(ENABLE_OPENSSL)
-  fastd_mac_impl(hmac-sha1 openssl
-    hmac_sha1_openssl.c
-  )
-  fastd_cipher_impl_include_directories(hmac-sha1 openssl ${OPENSSL_INCLUDE_DIRS})
-endif(ENABLE_OPENSSL)
diff --git a/src/crypto/mac/hmac_sha1/openssl/hmac_sha1_openssl.c b/src/crypto/mac/hmac_sha1/openssl/hmac_sha1_openssl.c
deleted file mode 100644
index 2e0c097..0000000
--- a/src/crypto/mac/hmac_sha1/openssl/hmac_sha1_openssl.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-  Copyright (c) 2012-2014, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
-   \file
-
-   Portable, table-based HMAC-SHA1 implementation
-*/
-
-
-#include "../../../../alloc.h"
-#include "../../../../crypto.h"
-
-#include <openssl/evp.h>
-
-
-/** The MAC state containing the OpenSSL digest context */
-struct fastd_mac_state {
-	EVP_PKEY *pkey;			/**< The OpenSSL private key */
-	EVP_MD_CTX *digest;		/**< The OpenSSL digest context */
-};
-
-
-/** Initializes the MAC state with the unpacked key data */
-static fastd_mac_state_t * hmac_sha1_init(const uint8_t *key) {
-	fastd_mac_state_t *state = fastd_new(fastd_mac_state_t);
-
-	state->digest = EVP_MD_CTX_create();
-	if (!state->digest)
-		exit_error("EVP_MD_CTX_create");
-
-	state->pkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, NULL, key, 64);
-	if (!state->pkey)
-		exit_error("EVP_PKEY_new_mac_key");
-
-	return state;
-}
-
-/** Calculates the HMAC-SHA1 of the supplied blocks */
-static bool hmac_sha1_digest(const fastd_mac_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t length) {
-	if (!EVP_DigestSignInit(state->digest, NULL, EVP_sha1(), NULL, state->pkey))
-		return false;
-
-	if (!EVP_DigestSignUpdate(state->digest, (const unsigned char *)in, length))
-		return false;
-
-	unsigned char digest[EVP_MAX_MD_SIZE];
-	size_t digestlen = 0;
-
-	if (!EVP_DigestSignFinal(state->digest, digest, &digestlen))
-		return false;
-
-	if (digestlen != 20)
-		exit_bug("EVP_DigestSignFinal: invalid HMAC-SHA1 length");
-
-	memcpy(out, digest, sizeof(fastd_block128_t));
-
-	return true;
-}
-
-/** Frees the MAC state */
-static void hmac_sha1_free(fastd_mac_state_t *state) {
-	if (state) {
-		EVP_MD_CTX_destroy(state->digest);
-		EVP_PKEY_free(state->pkey);
-		free(state);
-	}
-}
-
-/** The OpenSSL-based HMAC-SHA1 implementation */
-const fastd_mac_t fastd_mac_hmac_sha1_openssl = {
-	.init = hmac_sha1_init,
-	.digest = hmac_sha1_digest,
-	.free = hmac_sha1_free,
-};