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

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index e1db9341..58ca167f 100644
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -1,6 +1,6 @@
 /*
     digest.c -- Digest handling
-    Copyright (C) 2007 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
@@ -12,74 +12,96 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
+#include "../utils.h"
+#include "../xalloc.h"
 
 #include <openssl/err.h>
+#include <openssl/hmac.h>
 
 #include "digest.h"
-#include "logger.h"
+#include "../digest.h"
+#include "../logger.h"
+
+static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
+	digest_t *digest = xzalloc(sizeof *digest);
+	digest->digest = evp_md;
 
-static void set_maclength(digest_t *digest, int maclength) {
 	int digestlen = EVP_MD_size(digest->digest);
 
 	if(maclength > digestlen || maclength < 0)
 		digest->maclength = digestlen;
 	else
 		digest->maclength = maclength;
+
+	return digest;
 }
 
-bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
-	digest->digest = EVP_get_digestbyname(name);
+digest_t *digest_open_by_name(const char *name, int maclength) {
+	const EVP_MD *evp_md = EVP_get_digestbyname(name);
 
-	if(!digest->digest) {
-		logger(LOG_DEBUG, _("Unknown digest name '%s'!"), name);
+	if(!evp_md) {
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name);
 		return false;
 	}
 
-	set_maclength(digest, maclength);
-	return true;
+	return digest_open(evp_md, maclength);
 }
 
-bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
-	digest->digest = EVP_get_digestbynid(nid);
+digest_t *digest_open_by_nid(int nid, int maclength) {
+	const EVP_MD *evp_md = EVP_get_digestbynid(nid);
 
-	if(!digest->digest) {
-		logger(LOG_DEBUG, _("Unknown digest nid %d!"), nid);
+	if(!evp_md) {
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest nid %d!", nid);
 		return false;
 	}
 
-	set_maclength(digest, maclength);
-	return true;
+	return digest_open(evp_md, maclength);
 }
 
-bool digest_open_sha1(digest_t *digest, int maclength) {
-	digest->digest = EVP_sha1();
-
-	set_maclength(digest, 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;
 	return true;
 }
 
 void digest_close(digest_t *digest) {
+	if(!digest)
+		return;
+
+	free(digest->key);
+	free(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];
 
-	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) {
+		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_create();
+		if(!ctx)
+			abort();
+
+		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_destroy(ctx);
+			return false;
+		}
+
+		EVP_MD_CTX_destroy(ctx);
 	}
 
 	memcpy(outdata, tmpdata, digest->maclength);
@@ -87,20 +109,33 @@ 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);
 }
 
 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) {
+	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->type != 0;
+	return digest && digest->digest && EVP_MD_type(digest->digest) != 0;
 }