X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fprf.c;h=5d597d9ad793ea51070d719da2247eafc41860eb;hb=bcac314fe2d758e85335d499dbb4300bfa8a599e;hp=62770859593559859ae934b61679b47c89e61e38;hpb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;p=tinc diff --git a/src/openssl/prf.c b/src/openssl/prf.c index 62770859..5d597d9a 100644 --- a/src/openssl/prf.c +++ b/src/openssl/prf.c @@ -30,18 +30,19 @@ */ 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); + digest_t digest = {0}; - if(!digest) { + if(!digest_open_by_nid(&digest, nid, DIGEST_ALGO_SIZE)) { + digest_close(&digest); return false; } - if(!digest_set_key(digest, secret, secretlen)) { - digest_close(digest); + if(!digest_set_key(&digest, secret, secretlen)) { + digest_close(&digest); return false; } - size_t len = digest_length(digest); + size_t len = digest_length(&digest); /* Data is what the "inner" HMAC function processes. It consists of the previous HMAC result plus the seed. @@ -55,14 +56,14 @@ static bool prf_xor(int nid, const uint8_t *secret, size_t secretlen, uint8_t *s while(outlen > 0) { /* Inner HMAC */ - if(!digest_create(digest, data, len + seedlen, data)) { - digest_close(digest); + if(!digest_create(&digest, data, len + seedlen, data)) { + digest_close(&digest); return false; } /* Outer HMAC */ - if(!digest_create(digest, data, len + seedlen, hash)) { - digest_close(digest); + if(!digest_create(&digest, data, len + seedlen, hash)) { + digest_close(&digest); return false; } @@ -76,7 +77,7 @@ static bool prf_xor(int nid, const uint8_t *secret, size_t secretlen, uint8_t *s outlen -= i; } - digest_close(digest); + digest_close(&digest); return true; }