X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fprf.c;h=f1f3d172a5d7f2801716cd33cb2adacf73e63763;hb=df687b5ca86b93e0801db54ba4bca0f81ff02548;hp=943bd6207fed171b751533a6ba584841c20ff3c6;hpb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;p=tinc

diff --git a/src/openssl/prf.c b/src/openssl/prf.c
index 943bd620..f1f3d172 100644
--- a/src/openssl/prf.c
+++ b/src/openssl/prf.c
@@ -29,11 +29,12 @@
    We use SHA512 instead of MD5 and SHA1.
  */
 
-static bool prf_xor(int nid, const char *secret, size_t secretlen, char *seed, size_t seedlen, char *out, ssize_t outlen) {
+static bool prf_xor(int nid, const char *secret, size_t secretlen, char *seed, size_t seedlen, char *out, size_t outlen) {
 	digest_t *digest = digest_open_by_nid(nid, -1);
 
-	if(!digest)
+	if(!digest) {
 		return false;
+	}
 
 	if(!digest_set_key(digest, secret, secretlen)) {
 		digest_close(digest);
@@ -54,16 +55,25 @@ static bool prf_xor(int nid, const char *secret, size_t secretlen, char *seed, s
 
 	while(outlen > 0) {
 		/* Inner HMAC */
-		digest_create(digest, data, len + seedlen, data);
+		if(!digest_create(digest, data, len + seedlen, data)) {
+			digest_close(digest);
+			return false;
+		}
 
 		/* Outer HMAC */
-		digest_create(digest, data, len + seedlen, hash);
+		if(!digest_create(digest, data, len + seedlen, hash)) {
+			digest_close(digest);
+			return false;
+		}
 
 		/* XOR the results of the outer HMAC into the out buffer */
-		for(int i = 0; i < len && i < outlen; i++)
+		size_t i;
+
+		for(i = 0; i < len && i < outlen; i++) {
 			*out++ ^= hash[i];
+		}
 
-		outlen -= len;
+		outlen -= i;
 	}
 
 	digest_close(digest);