X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgcrypt%2Fdigest.c;h=1795277e2b304e6b719eb600aa3be1cf35c56dc0;hb=28b7a53b693f6b4e70218a926e68a36ece54cda1;hp=ad1f31d825ede77f9f508510592623ddf0e942c6;hpb=bcac314fe2d758e85335d499dbb4300bfa8a599e;p=tinc

diff --git a/src/gcrypt/digest.c b/src/gcrypt/digest.c
index ad1f31d8..1795277e 100644
--- a/src/gcrypt/digest.c
+++ b/src/gcrypt/digest.c
@@ -1,6 +1,6 @@
 /*
     digest.c -- Digest handling
-    Copyright (C) 2007-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2022 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
@@ -17,10 +17,11 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #include "digest.h"
-#include "logger.h"
+#include "../digest.h"
+#include "../logger.h"
 
 static struct {
 	const char *name;
@@ -35,9 +36,7 @@ static struct {
 };
 
 static bool nametodigest(const char *name, enum gcry_md_algos *algo) {
-	int i;
-
-	for(i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
+	for(size_t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
 		if(digesttable[i].name && !strcasecmp(name, digesttable[i].name)) {
 			*algo = digesttable[i].algo;
 			return true;
@@ -48,7 +47,7 @@ static bool nametodigest(const char *name, enum gcry_md_algos *algo) {
 }
 
 static bool nidtodigest(int nid, enum gcry_md_algos *algo) {
-	for(int i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
+	for(size_t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
 		if(nid == digesttable[i].nid) {
 			*algo = digesttable[i].algo;
 			return true;
@@ -59,7 +58,7 @@ static bool nidtodigest(int nid, enum gcry_md_algos *algo) {
 }
 
 static bool digesttonid(enum gcry_md_algos algo, int *nid) {
-	for(int i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
+	for(size_t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
 		if(algo == digesttable[i].algo) {
 			*nid = digesttable[i].nid;
 			return true;
@@ -77,7 +76,7 @@ static bool digest_open(digest_t *digest, enum gcry_md_algos algo, size_t maclen
 
 	unsigned int len = gcry_md_get_algo_dlen(algo);
 
-	if(maclength > len || maclength < 0) {
+	if(maclength > len) {
 		digest->maclength = len;
 	} else {
 		digest->maclength = maclength;
@@ -111,10 +110,6 @@ bool digest_open_by_nid(digest_t *digest, int nid, size_t maclength) {
 	return digest_open(digest, algo, maclength);
 }
 
-bool digest_open_sha1(digest_t *digest, size_t maclength) {
-	return digest_open(digest, GCRY_MD_SHA1, maclength);
-}
-
 void digest_close(digest_t *digest) {
 	if(digest->hmac) {
 		gcry_md_close(digest->hmac);
@@ -166,13 +161,21 @@ bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const voi
 }
 
 int digest_get_nid(const digest_t *digest) {
+	if(!digest || !digest->nid) {
+		return 0;
+	}
+
 	return digest->nid;
 }
 
 size_t digest_length(const digest_t *digest) {
+	if(!digest) {
+		return 0;
+	}
+
 	return digest->maclength;
 }
 
 bool digest_active(const digest_t *digest) {
-	return digest->algo != GCRY_MD_NONE;
+	return digest && digest->algo != GCRY_MD_NONE;
 }