X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fdigest.c;h=135e7e69fd0c20eb2072c5c741b138d7d9f3ec07;hb=323c17e232539f3f06e7cebc664ab48f60127e0e;hp=9406701b8c3b5a7f224ad149ba5fcf4819db92b7;hpb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;p=tinc

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 9406701b..135e7e69 100644
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -29,7 +29,7 @@
 #include "../logger.h"
 
 static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
-	digest_t *digest = xmalloc_and_zero(sizeof *digest);
+	digest_t *digest = xzalloc(sizeof *digest);
 	digest->digest = evp_md;
 
 	int digestlen = EVP_MD_size(digest->digest);
@@ -88,16 +88,24 @@ bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
 	unsigned char tmpdata[len];
 
 	if(digest->key) {
-		HMAC(digest->digest, digest->key, digest->keylength, indata, inlen, tmpdata, NULL);
+		if(!HMAC(digest->digest, digest->key, digest->keylength, indata, inlen, 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 *ctx = EVP_MD_CTX_create();
+		if(!ctx)
+			abort();
 
-		if(!EVP_DigestInit(&ctx, digest->digest)
-				|| !EVP_DigestUpdate(&ctx, indata, inlen)
-				|| !EVP_DigestFinal(&ctx, tmpdata, NULL)) {
+		if(!EVP_DigestInit(ctx, digest->digest)
+				|| !EVP_DigestUpdate(ctx, indata, inlen)
+				|| !EVP_DigestFinal(ctx, tmpdata, NULL)) {
 			logger(DEBUG_ALWAYS, LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL));
+			EVP_MD_CTX_free(ctx);
 			return false;
 		}
+
+		EVP_MD_CTX_free(ctx);
 	}
 
 	memcpy(outdata, tmpdata, digest->maclength);
@@ -112,17 +120,26 @@ bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const voi
 }
 
 int digest_get_nid(const digest_t *digest) {
-	return digest->digest ? digest->digest->type : 0;
+	if(!digest || !digest->digest)
+		return 0;
+
+	return EVP_MD_type(digest->digest);
 }
 
 size_t digest_keylength(const digest_t *digest) {
-	return digest->digest->md_size;
+	if(!digest || !digest->digest)
+		return 0;
+
+	return EVP_MD_size(digest->digest);
 }
 
 size_t digest_length(const digest_t *digest) {
+	if(!digest)
+		return 0;
+
 	return digest->maclength;
 }
 
 bool digest_active(const digest_t *digest) {
-	return digest && digest->digest && digest->digest->type != 0;
+	return digest && digest->digest && EVP_MD_type(digest->digest) != 0;
 }