X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fdigest.c;h=3159e7a39a90fa9388927f675a9ad020b8a9fe75;hb=8ac096b5bf9da1b3961a3ac4a03d083629222a63;hp=ff350daa8953d4180e75edfbe09ebbd8045a7ccd;hpb=108b238915c5f58b3d94ab433dc5d04e064c2b11;p=tinc

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index ff350daa..3159e7a3 100644
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -18,8 +18,11 @@
 */
 
 #include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 #include <openssl/err.h>
+#include <openssl/hmac.h>
 
 #include "digest.h"
 #include "logger.h"
@@ -35,9 +38,10 @@ static void set_maclength(digest_t *digest, int maclength) {
 
 bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
 	digest->digest = EVP_get_digestbyname(name);
+	digest->key = NULL;
 
 	if(!digest->digest) {
-		logger(LOG_DEBUG, "Unknown digest name '%s'!", name);
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name);
 		return false;
 	}
 
@@ -47,9 +51,10 @@ bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
 
 bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
 	digest->digest = EVP_get_digestbynid(nid);
+	digest->key = NULL;
 
 	if(!digest->digest) {
-		logger(LOG_DEBUG, "Unknown digest nid %d!", nid);
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest nid %d!", nid);
 		return false;
 	}
 
@@ -59,25 +64,40 @@ bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
 
 bool digest_open_sha1(digest_t *digest, int maclength) {
 	digest->digest = EVP_sha1();
+	digest->key = NULL;
 
 	set_maclength(digest, 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;
+	return true;
+}
+
 void digest_close(digest_t *digest) {
+	if(digest->key)
+		free(digest->key);
+	digest->key = NULL;
 }
 
 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];
 
-	EVP_MD_CTX ctx;
-
-	if(!EVP_DigestInit(&ctx, digest->digest)
-			|| !EVP_DigestUpdate(&ctx, indata, inlen)
-			|| !EVP_DigestFinal(&ctx, tmpdata, NULL)) {
-		logger(LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL));
-		return false;
+	if(digest->key) {
+		HMAC(digest->digest, digest->key, digest->keylength, indata, inlen, tmpdata, NULL);
+	} else {
+		EVP_MD_CTX ctx;
+
+		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));
+			return false;
+		}
 	}
 
 	memcpy(outdata, tmpdata, digest->maclength);
@@ -85,7 +105,7 @@ bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
 }
 
 bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *cmpdata) {
-	size_t len = EVP_MD_size(digest->digest);
+	size_t len = digest->maclength;
 	unsigned char outdata[len];
 
 	return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, digest->maclength);
@@ -95,6 +115,10 @@ int digest_get_nid(const digest_t *digest) {
 	return digest->digest ? digest->digest->type : 0;
 }
 
+size_t digest_keylength(const digest_t *digest) {
+	return digest->digest->md_size;
+}
+
 size_t digest_length(const digest_t *digest) {
 	return digest->maclength;
 }