Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / openssl / prf.c

diff --git a/src/openssl/prf.c b/src/openssl/prf.c
index 4f5a52b..6277085 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) {
-       digest_t *digest = digest_open_by_nid(nid, -1);
+static bool prf_xor(int nid, const uint8_t *secret, size_t secretlen, uint8_t *seed, size_t seedlen, uint8_t *out, size_t outlen) {
+       digest_t *digest = digest_open_by_nid(nid, DIGEST_ALGO_SIZE);
 
-       if(!digest)
+       if(!digest) {
                return false;
+       }
 
        if(!digest_set_key(digest, secret, secretlen)) {
                digest_close(digest);
@@ -50,7 +51,7 @@ static bool prf_xor(int nid, const char *secret, size_t secretlen, char *seed, s
        memset(data, 0, len);
        memcpy(data + len, seed, seedlen);
 
-       char hash[len];
+       uint8_t hash[len];
 
        while(outlen > 0) {
                /* Inner HMAC */
@@ -66,17 +67,20 @@ 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);
        return true;
 }
 
-bool prf(const char *secret, size_t secretlen, char *seed, size_t seedlen, char *out, size_t outlen) {
+bool prf(const uint8_t *secret, size_t secretlen, uint8_t *seed, size_t seedlen, uint8_t *out, size_t outlen) {
        /* This construction allows us to easily switch back to a scheme where the PRF is calculated using two different digest algorithms. */
        memset(out, 0, outlen);