X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnolegacy%2Fprf.c;h=ce80f8cfb98f307f0f9d453cf8fc3bd0130b6af4;hb=e56589082f6198380d7f2246a776e41d388496f6;hp=3c4c27ed498fd8bb2735375aec28890fe1432cc3;hpb=4d50f9f3485503099f5cb6e8486e9b98b72cb9be;p=tinc

diff --git a/src/nolegacy/prf.c b/src/nolegacy/prf.c
index 3c4c27ed..ce80f8cf 100644
--- a/src/nolegacy/prf.c
+++ b/src/nolegacy/prf.c
@@ -23,43 +23,55 @@
 #include "../ed25519/sha512.h"
 
 static void memxor(char *buf, char c, size_t len) {
-	for(size_t i = 0; i < len; i++)
+	for(size_t i = 0; i < len; i++) {
 		buf[i] ^= c;
+	}
 }
 
 static const size_t mdlen = 64;
+static const size_t blklen = 128;
 
 static bool hmac_sha512(const char *key, size_t keylen, const char *msg, size_t msglen, char *out) {
-	char tmp[2 * mdlen];
+	char tmp[blklen + mdlen];
 	sha512_context md;
 
-	if(keylen <= mdlen) {
+	if(keylen <= blklen) {
 		memcpy(tmp, key, keylen);
-		memset(tmp + keylen, 0, mdlen - keylen);
+		memset(tmp + keylen, 0, blklen - keylen);
 	} else {
-		if(sha512(key, keylen, tmp) != 0)
+		if(sha512(key, keylen, tmp) != 0) {
 			return false;
+		}
+
+		memset(tmp + mdlen, 0, blklen - mdlen);
 	}
 
-	if(sha512_init(&md) != 0)
+	if(sha512_init(&md) != 0) {
 		return false;
+	}
 
 	// ipad
-	memxor(tmp, 0x36, mdlen);
-	if(sha512_update(&md, tmp, mdlen) != 0)
+	memxor(tmp, 0x36, blklen);
+
+	if(sha512_update(&md, tmp, blklen) != 0) {
 		return false;
+	}
 
 	// message
-	if(sha512_update(&md, msg, msglen) != 0)
+	if(sha512_update(&md, msg, msglen) != 0) {
 		return false;
+	}
 
-	if(sha512_final(&md, tmp + mdlen) != 0)
+	if(sha512_final(&md, tmp + blklen) != 0) {
 		return false;
+	}
 
 	// opad
-	memxor(tmp, 0x36 ^ 0x5c, mdlen);
-	if(sha512(tmp, sizeof tmp, out) != 0)
+	memxor(tmp, 0x36 ^ 0x5c, blklen);
+
+	if(sha512(tmp, sizeof(tmp), out) != 0) {
 		return false;
+	}
 
 	return true;
 }
@@ -82,18 +94,23 @@ bool prf(const char *secret, size_t secretlen, char *seed, size_t seedlen, char
 
 	while(outlen > 0) {
 		/* Inner HMAC */
-		if(!hmac_sha512(data, sizeof data, secret, secretlen, data))
+		if(!hmac_sha512(secret, secretlen, data, sizeof(data), data)) {
 			return false;
+		}
 
 		/* Outer HMAC */
 		if(outlen >= mdlen) {
-			if(!hmac_sha512(data, sizeof data, secret, secretlen, out))
+			if(!hmac_sha512(secret, secretlen, data, sizeof(data), out)) {
 				return false;
+			}
+
 			out += mdlen;
 			outlen -= mdlen;
 		} else {
-			if(!hmac_sha512(data, sizeof data, secret, secretlen, hash))
+			if(!hmac_sha512(secret, secretlen, data, sizeof(data), hash)) {
 				return false;
+			}
+
 			memcpy(out, hash, outlen);
 			out += outlen;
 			outlen = 0;