X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fdigest.c;h=d51dcaa971842e47a62defcdfc7dae31e8da91c1;hb=ecfef0eeb9b52f6d75b4aa936a1e11e6d8e678e3;hp=58ca167f309b5329375ee3ff204a65c05260f55d;hpb=edc1efed3c0cf5aebb1c765066c0413757229a31;p=tinc

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 58ca167f..d51dcaa9 100644
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -29,15 +29,16 @@
 #include "../logger.h"
 
 static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
-	digest_t *digest = xzalloc(sizeof *digest);
+	digest_t *digest = xzalloc(sizeof(*digest));
 	digest->digest = evp_md;
 
 	int digestlen = EVP_MD_size(digest->digest);
 
-	if(maclength > digestlen || maclength < 0)
+	if(maclength > digestlen || maclength < 0) {
 		digest->maclength = digestlen;
-	else
+	} else {
 		digest->maclength = maclength;
+	}
 
 	return digest;
 }
@@ -65,17 +66,29 @@ 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, len, digest->digest, NULL);
+
+	if(!digest->hmac_ctx) {
+		abort();
+	}
+
 	return true;
 }
 
 void digest_close(digest_t *digest) {
-	if(!digest)
+	if(!digest) {
 		return;
+	}
+
+	if(digest->md_ctx) {
+		EVP_MD_CTX_destroy(digest->md_ctx);
+	}
+
+	if(digest->hmac_ctx) {
+		HMAC_CTX_free(digest->hmac_ctx);
+	}
 
-	free(digest->key);
 	free(digest);
 }
 
@@ -83,25 +96,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(!ctx)
+		if(!digest->md_ctx) {
+			digest->md_ctx = EVP_MD_CTX_create();
+		}
+
+		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);
@@ -116,22 +132,25 @@ bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const voi
 }
 
 int digest_get_nid(const digest_t *digest) {
-	if(!digest || !digest->digest)
+	if(!digest || !digest->digest) {
 		return 0;
+	}
 
 	return EVP_MD_type(digest->digest);
 }
 
 size_t digest_keylength(const digest_t *digest) {
-	if(!digest || !digest->digest)
+	if(!digest || !digest->digest) {
 		return 0;
+	}
 
 	return EVP_MD_size(digest->digest);
 }
 
 size_t digest_length(const digest_t *digest) {
-	if(!digest)
+	if(!digest) {
 		return 0;
+	}
 
 	return digest->maclength;
 }