X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgcrypt%2Fdigest.c;h=60b9569f17713aa9a6883955173d734373a2de97;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=066600f9b1c18b966a1534be1ae855739a9226ee;hpb=ce8775000ab38229a78ecf3dc26bab008ca0f332;p=tinc

diff --git a/src/gcrypt/digest.c b/src/gcrypt/digest.c
index 066600f9..60b9569f 100644
--- a/src/gcrypt/digest.c
+++ b/src/gcrypt/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
@@ -37,7 +37,7 @@ static struct {
 static bool nametodigest(const char *name, int *algo) {
 	int i;
 
-	for(i = 0; i < sizeof digesttable / sizeof *digesttable; i++) {
+	for(i = 0; i < sizeof(digesttable) / sizeof *digesttable; i++) {
 		if(digesttable[i].name && !strcasecmp(name, digesttable[i].name)) {
 			*algo = digesttable[i].algo;
 			return true;
@@ -50,7 +50,7 @@ static bool nametodigest(const char *name, int *algo) {
 static bool nidtodigest(int nid, int *algo) {
 	int i;
 
-	for(i = 0; i < sizeof digesttable / sizeof *digesttable; i++) {
+	for(i = 0; i < sizeof(digesttable) / sizeof *digesttable; i++) {
 		if(nid == digesttable[i].nid) {
 			*algo = digesttable[i].algo;
 			return true;
@@ -63,7 +63,7 @@ static bool nidtodigest(int nid, int *algo) {
 static bool digesttonid(int algo, int *nid) {
 	int i;
 
-	for(i = 0; i < sizeof digesttable / sizeof *digesttable; i++) {
+	for(i = 0; i < sizeof(digesttable) / sizeof *digesttable; i++) {
 		if(algo == digesttable[i].algo) {
 			*nid = digesttable[i].nid;
 			return true;
@@ -75,7 +75,7 @@ static bool digesttonid(int algo, int *nid) {
 
 static bool digest_open(digest_t *digest, int algo, int maclength) {
 	if(!digesttonid(algo, &digest->nid)) {
-		logger(LOG_DEBUG, "Digest %d has no corresponding nid!", algo);
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Digest %d has no corresponding nid!", algo);
 		return false;
 	}
 
@@ -85,7 +85,7 @@ static bool digest_open(digest_t *digest, int algo, int maclength) {
 		digest->maclength = len;
 	else
 		digest->maclength = maclength;
-	
+
 	digest->algo = algo;
 	digest->hmac = NULL;
 
@@ -96,7 +96,7 @@ bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
 	int algo;
 
 	if(!nametodigest(name, &algo)) {
-		logger(LOG_DEBUG, "Unknown digest name '%s'!", name);
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name);
 		return false;
 	}
 
@@ -107,7 +107,7 @@ bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
 	int algo;
 
 	if(!nidtodigest(nid, &algo)) {
-		logger(LOG_DEBUG, "Unknown digest ID %d!", nid);
+		logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest ID %d!", nid);
 		return false;
 	}