X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fdigest.c;h=71eaec7c5ffee9e01a26f849109dda2e3ec2d914;hb=bcac314fe2d758e85335d499dbb4300bfa8a599e;hp=20e45b645680f9e02fbc9641c154bf6404d341c3;hpb=1545909dcb3ac618754486f4ccd4d8f237d64bb7;p=tinc

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 20e45b64..71eaec7c 100644
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -18,7 +18,6 @@
 */
 
 #include "../system.h"
-#include "../xalloc.h"
 
 #include <openssl/err.h>
 #include <openssl/hmac.h>
@@ -27,22 +26,19 @@
 #include "../digest.h"
 #include "../logger.h"
 
-static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
-	digest_t *digest = xzalloc(sizeof(*digest));
+static void digest_open(digest_t *digest, const EVP_MD *evp_md, size_t maclength) {
 	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;
 	}
-
-	return digest;
 }
 
-digest_t *digest_open_by_name(const char *name, int maclength) {
+bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength) {
 	const EVP_MD *evp_md = EVP_get_digestbyname(name);
 
 	if(!evp_md) {
@@ -50,10 +46,11 @@ digest_t *digest_open_by_name(const char *name, int maclength) {
 		return false;
 	}
 
-	return digest_open(evp_md, maclength);
+	digest_open(digest, evp_md, maclength);
+	return true;
 }
 
-digest_t *digest_open_by_nid(int nid, int maclength) {
+bool digest_open_by_nid(digest_t *digest, int nid, size_t maclength) {
 	const EVP_MD *evp_md = EVP_get_digestbynid(nid);
 
 	if(!evp_md) {
@@ -61,12 +58,13 @@ digest_t *digest_open_by_nid(int nid, int maclength) {
 		return false;
 	}
 
-	return digest_open(evp_md, maclength);
+	digest_open(digest, evp_md, maclength);
+	return true;
 }
 
 bool digest_set_key(digest_t *digest, const void *key, size_t len) {
 	digest->hmac_ctx = HMAC_CTX_new();
-	HMAC_Init_ex(digest->hmac_ctx, key, len, digest->digest, NULL);
+	HMAC_Init_ex(digest->hmac_ctx, key, (int)len, digest->digest, NULL);
 
 	if(!digest->hmac_ctx) {
 		abort();
@@ -88,7 +86,7 @@ void digest_close(digest_t *digest) {
 		HMAC_CTX_free(digest->hmac_ctx);
 	}
 
-	free(digest);
+	memset(digest, 0, sizeof(*digest));
 }
 
 bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) {