9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GNUTLS: Cleanup fingerprint generation

Browse source 
Removes intermediate buffer, properly check return values
This commit is contained in:
Aaron Jones 2016-08-19 19:14:40 +00:00
parent fd9f652150
commit 6971019a09
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
librb/src/gnutls.c
View file

@ -610,7 +610,6 @@ static int
make_certfp(gnutls_x509_crt_t cert, uint8_t certfp[RB_SSL_CERTFP_LEN], int method) make_certfp(gnutls_x509_crt_t cert, uint8_t certfp[RB_SSL_CERTFP_LEN], int method)
{ {
gnutls_digest_algorithm_t algo; gnutls_digest_algorithm_t algo;
uint8_t digest[RB_SSL_CERTFP_LEN * 2];
size_t digest_size; size_t digest_size;
bool spki = false; bool spki = false;
int len; int len;
@ -639,7 +638,7 @@ make_certfp(gnutls_x509_crt_t cert, uint8_t certfp[RB_SSL_CERTFP_LEN], int metho
if (!spki) if (!spki)
{ {
if (gnutls_x509_crt_get_fingerprint(cert, algo, digest, &digest_size) < 0) if (gnutls_x509_crt_get_fingerprint(cert, algo, certfp, &digest_size) != 0)
len = 0; len = 0;
} }
else else
@ -669,7 +668,7 @@ make_certfp(gnutls_x509_crt_t cert, uint8_t certfp[RB_SSL_CERTFP_LEN], int metho
if (der_pubkey) if (der_pubkey)
{ {
if (gnutls_hash_fast(algo, der_pubkey, der_pubkey_len, digest) != 0) if (gnutls_hash_fast(algo, der_pubkey, der_pubkey_len, certfp) != 0)
len = 0; len = 0;
rb_free(der_pubkey); rb_free(der_pubkey);
@ -680,8 +679,6 @@ make_certfp(gnutls_x509_crt_t cert, uint8_t certfp[RB_SSL_CERTFP_LEN], int metho
} }
} }
if (len)
memcpy(certfp, digest, len);
return len; return len;
} }