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

diff --git a/src/gcrypt/digest.c b/src/gcrypt/digest.c
index 1795277e..e0291689 100644
--- a/src/gcrypt/digest.c
+++ b/src/gcrypt/digest.c
@@ -25,17 +25,17 @@
 
 static struct {
 	const char *name;
-	enum gcry_md_algos algo;
-	int nid;
+	md_algo_t algo;
+	nid_t nid;
 } digesttable[] = {
-	{"none", GCRY_MD_NONE, 0},
-	{"sha1", GCRY_MD_SHA1, 64},
+	{"none",   GCRY_MD_NONE,   0},
+	{"sha1",   GCRY_MD_SHA1,   64},
 	{"sha256", GCRY_MD_SHA256, 672},
 	{"sha384", GCRY_MD_SHA384, 673},
 	{"sha512", GCRY_MD_SHA512, 674},
 };
 
-static bool nametodigest(const char *name, enum gcry_md_algos *algo) {
+static bool nametodigest(md_algo_t *algo, const char *name) {
 	for(size_t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
 		if(digesttable[i].name && !strcasecmp(name, digesttable[i].name)) {
 			*algo = digesttable[i].algo;
@@ -46,7 +46,7 @@ static bool nametodigest(const char *name, enum gcry_md_algos *algo) {
 	return false;
 }
 
-static bool nidtodigest(int nid, enum gcry_md_algos *algo) {
+static bool nidtodigest(md_algo_t *algo, nid_t nid) {
 	for(size_t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
 		if(nid == digesttable[i].nid) {
 			*algo = digesttable[i].algo;
@@ -57,7 +57,7 @@ static bool nidtodigest(int nid, enum gcry_md_algos *algo) {
 	return false;
 }
 
-static bool digesttonid(enum gcry_md_algos algo, int *nid) {
+static bool digesttonid(nid_t *nid, md_algo_t algo) {
 	for(size_t i = 0; i < sizeof(digesttable) / sizeof(*digesttable); i++) {
 		if(algo == digesttable[i].algo) {
 			*nid = digesttable[i].nid;
@@ -68,8 +68,8 @@ static bool digesttonid(enum gcry_md_algos algo, int *nid) {
 	return false;
 }
 
-static bool digest_open(digest_t *digest, enum gcry_md_algos algo, size_t maclength) {
-	if(!digesttonid(algo, &digest->nid)) {
+static bool digest_open(digest_t *digest, md_algo_t algo, size_t maclength) {
+	if(!digesttonid(&digest->nid, algo)) {
 		logger(DEBUG_ALWAYS, LOG_DEBUG, "Digest %d has no corresponding nid!", algo);
 		return false;
 	}
@@ -89,9 +89,9 @@ static bool digest_open(digest_t *digest, enum gcry_md_algos algo, size_t maclen
 }
 
 bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength) {
-	enum gcry_md_algos algo;
+	md_algo_t algo;
 
-	if(!nametodigest(name, &algo)) {
+	if(!nametodigest(&algo, name)) {
 		logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest name '%s'!", name);
 		return false;
 	}
@@ -99,10 +99,10 @@ bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength) {
 	return digest_open(digest, algo, maclength);
 }
 
-bool digest_open_by_nid(digest_t *digest, int nid, size_t maclength) {
-	enum gcry_md_algos algo;
+bool digest_open_by_nid(digest_t *digest, nid_t nid, size_t maclength) {
+	md_algo_t algo;
 
-	if(!nidtodigest(nid, &algo)) {
+	if(!nidtodigest(&algo, nid)) {
 		logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown digest ID %d!", nid);
 		return false;
 	}
@@ -111,6 +111,10 @@ bool digest_open_by_nid(digest_t *digest, int nid, size_t maclength) {
 }
 
 void digest_close(digest_t *digest) {
+	if(!digest) {
+		return;
+	}
+
 	if(digest->hmac) {
 		gcry_md_close(digest->hmac);
 	}
@@ -145,7 +149,7 @@ bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *out
 
 		memcpy(outdata, tmpdata, digest->maclength);
 	} else {
-		char tmpdata[len];
+		char *tmpdata = alloca(len);
 		gcry_md_hash_buffer(digest->algo, tmpdata, indata, inlen);
 		memcpy(outdata, tmpdata, digest->maclength);
 	}
@@ -155,12 +159,12 @@ 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 = digest->maclength;
-	uint8_t outdata[len];
+	uint8_t *outdata = alloca(len);
 
 	return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len);
 }
 
-int digest_get_nid(const digest_t *digest) {
+nid_t digest_get_nid(const digest_t *digest) {
 	if(!digest || !digest->nid) {
 		return 0;
 	}