X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fopenssl%2Fdigest.c;h=82364e71445ba497618122d599475199fdd22b8e;hb=8c8dfd6686a3d4cc11c20a09c8dfbc8321b07cdb;hp=9c3ab1e8e88ff1efd1500539ce351794bb5d5b6a;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 9c3ab1e8..82364e71 100644
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -18,7 +18,6 @@
 */
 
 #include "../system.h"
-#include "../utils.h"
 #include "../xalloc.h"
 
 #include <openssl/err.h>
@@ -28,13 +27,13 @@
 #include "../digest.h"
 #include "../logger.h"
 
-static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
+static digest_t *digest_open(const EVP_MD *evp_md, size_t maclength) {
 	digest_t *digest = xzalloc(sizeof(*digest));
 	digest->digest = evp_md;
 
-	int digestlen = EVP_MD_size(digest->digest);
+	size_t digestlen = EVP_MD_size(digest->digest);
 
-	if(maclength > digestlen || maclength < 0) {
+	if(maclength == DIGEST_ALGO_SIZE || maclength > digestlen) {
 		digest->maclength = digestlen;
 	} else {
 		digest->maclength = maclength;
@@ -43,7 +42,7 @@ static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
 	return digest;
 }
 
-digest_t *digest_open_by_name(const char *name, int maclength) {
+digest_t *digest_open_by_name(const char *name, size_t maclength) {
 	const EVP_MD *evp_md = EVP_get_digestbyname(name);
 
 	if(!evp_md) {
@@ -54,7 +53,7 @@ digest_t *digest_open_by_name(const char *name, int maclength) {
 	return digest_open(evp_md, maclength);
 }
 
-digest_t *digest_open_by_nid(int nid, int maclength) {
+digest_t *digest_open_by_nid(int nid, size_t maclength) {
 	const EVP_MD *evp_md = EVP_get_digestbynid(nid);
 
 	if(!evp_md) {
@@ -66,9 +65,13 @@ digest_t *digest_open_by_nid(int nid, int maclength) {
 }
 
 bool digest_set_key(digest_t *digest, const void *key, size_t len) {
-	digest->key = xrealloc(digest->key, len);
-	memcpy(digest->key, key, len);
-	digest->keylength = len;
+	digest->hmac_ctx = HMAC_CTX_new();
+	HMAC_Init_ex(digest->hmac_ctx, key, (int)len, digest->digest, NULL);
+
+	if(!digest->hmac_ctx) {
+		abort();
+	}
+
 	return true;
 }
 
@@ -77,7 +80,14 @@ void digest_close(digest_t *digest) {
 		return;
 	}
 
-	free(digest->key);
+	if(digest->md_ctx) {
+		EVP_MD_CTX_destroy(digest->md_ctx);
+	}
+
+	if(digest->hmac_ctx) {
+		HMAC_CTX_free(digest->hmac_ctx);
+	}
+
 	free(digest);
 }
 
@@ -85,27 +95,28 @@ bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
 	size_t len = EVP_MD_size(digest->digest);
 	unsigned char tmpdata[len];
 
-	if(digest->key) {
-		if(!HMAC(digest->digest, digest->key, digest->keylength, indata, inlen, tmpdata, NULL)) {
+	if(digest->hmac_ctx) {
+		if(!HMAC_Init_ex(digest->hmac_ctx, NULL, 0, NULL, NULL)
+		                || !HMAC_Update(digest->hmac_ctx, indata, inlen)
+		                || !HMAC_Final(digest->hmac_ctx, tmpdata, NULL)) {
 			logger(DEBUG_ALWAYS, LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL));
 			return false;
 		}
 	} else {
-		EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+		if(!digest->md_ctx) {
+			digest->md_ctx = EVP_MD_CTX_create();
+		}
 
-		if(!ctx) {
+		if(!digest->md_ctx) {
 			abort();
 		}
 
-		if(!EVP_DigestInit(ctx, digest->digest)
-		                || !EVP_DigestUpdate(ctx, indata, inlen)
-		                || !EVP_DigestFinal(ctx, tmpdata, NULL)) {
+		if(!EVP_DigestInit(digest->md_ctx, digest->digest)
+		                || !EVP_DigestUpdate(digest->md_ctx, indata, inlen)
+		                || !EVP_DigestFinal(digest->md_ctx, tmpdata, NULL)) {
 			logger(DEBUG_ALWAYS, LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL));
-			EVP_MD_CTX_destroy(ctx);
 			return false;
 		}
-
-		EVP_MD_CTX_destroy(ctx);
 	}
 
 	memcpy(outdata, tmpdata, digest->maclength);