Call ENGINE_load_builtin_engines().

[tinc] / src / openssl / prf.c

diff --git a/src/openssl/prf.c b/src/openssl/prf.c
index 4f5a52b..f1f3d17 100644 (file)
--- 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);
@@ -66,10 +67,13 @@ static bool prf_xor(int nid, const char *secret, size_t secretlen, char *seed, s
                }
 
                /* 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);