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

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 8d97e3bf..71eaec7c 100644
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -1,6 +1,6 @@
 /*
     digest.c -- Digest handling
-    Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2016 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,8 +18,6 @@
 */
 
 #include "../system.h"
-#include "../utils.h"
-#include "../xalloc.h"
 
 #include <openssl/err.h>
 #include <openssl/hmac.h>
@@ -28,21 +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
+	} 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,43 +58,60 @@ digest_t *digest_open_by_nid(int nid, int maclength) {
 		return false;
 	}
 
-	return digest_open(evp_md, maclength);
-}
-
-digest_t *digest_open_sha1(int maclength) {
-	return digest_open(EVP_sha1(), maclength);
+	digest_open(digest, evp_md, maclength);
+	return true;
 }
 
 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;
 }
 
 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);
+	memset(digest, 0, sizeof(*digest));
 }
 
 bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) {
 	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;
+		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));
 			return false;
 		}
@@ -115,17 +129,29 @@ 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;
 }