X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fopenssl%2Fdigest.c;h=79db491d67fd1bcc4838494f56f84f247dbb6025;hb=70a1a5594af5d4e6a364186b42ba4e34c676009b;hp=88bdeb3135491b68f5ca28bf3148057a525423d1;hpb=36623e15a1c8685e5d8730345c1a7f9c93710fef;p=meshlink

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 88bdeb31..79db491d 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-2012 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
@@ -41,7 +41,7 @@ bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
 	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;
 	}
 
@@ -54,7 +54,7 @@ bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
 	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;
 	}
 
@@ -78,8 +78,7 @@ bool digest_set_key(digest_t *digest, const void *key, size_t len) {
 }
 
 void digest_close(digest_t *digest) {
-	if(digest->key)
-		free(digest->key);
+	free(digest->key);
 	digest->key = NULL;
 }
 
@@ -95,7 +94,7 @@ bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
 		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));
+			logger(DEBUG_ALWAYS, LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL));
 			return false;
 		}
 	}