generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pinning: minor code style policing

Browse Source
This commit is contained in:
Daniel Stenberg
2014-10-13 22:22:49 +02:00
parent 357ff4d1dc
commit 9d64ab7d5a
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vtls/gtls.c
View File

@@ -692,8 +692,11 @@ static CURLcode pkp_pin_peer_pubkey(gnutls_x509_crt_t cert,
CURLcode result = CURLE_SSL_PINNEDPUBKEYNOTMATCH; CURLcode result = CURLE_SSL_PINNEDPUBKEYNOTMATCH;
/* if a path wasn't specified, don't pin */ /* if a path wasn't specified, don't pin */
if(NULL == pinnedpubkey) return CURLE_OK; if(NULL == pinnedpubkey)
if(NULL == cert) return result; return CURLE_OK;
if(NULL == cert)
return result;
do { do {
/* Begin Gyrations to get the public key */ /* Begin Gyrations to get the public key */
@@ -705,7 +708,7 @@ static CURLcode pkp_pin_peer_pubkey(gnutls_x509_crt_t cert,
ret = gnutls_pubkey_export(key, GNUTLS_X509_FMT_DER, NULL, &len1); ret = gnutls_pubkey_export(key, GNUTLS_X509_FMT_DER, NULL, &len1);
if(ret != GNUTLS_E_SHORT_MEMORY_BUFFER || len1 == 0) if(ret != GNUTLS_E_SHORT_MEMORY_BUFFER || len1 == 0)
break; /* failed */ break; /* failed */
buff1 = malloc(len1); buff1 = malloc(len1);
if(NULL == buff1) if(NULL == buff1)

9
lib/vtls/openssl.c
View File

@@ -2376,8 +2376,11 @@ static CURLcode pkp_pin_peer_pubkey(X509* cert, const char *pinnedpubkey)
CURLcode result = CURLE_SSL_PINNEDPUBKEYNOTMATCH; CURLcode result = CURLE_SSL_PINNEDPUBKEYNOTMATCH;
/* if a path wasn't specified, don't pin */ /* if a path wasn't specified, don't pin */
if(NULL == pinnedpubkey) return CURLE_OK; if(NULL == pinnedpubkey)
if(NULL == cert) return result; return CURLE_OK;
if(NULL == cert)
return result;
do { do {
/* Begin Gyrations to get the subjectPublicKeyInfo */ /* Begin Gyrations to get the subjectPublicKeyInfo */
@@ -2412,7 +2415,7 @@ static CURLcode pkp_pin_peer_pubkey(X509* cert, const char *pinnedpubkey)
} while(0); } while(0);
/* http://www.openssl.org/docs/crypto/buffer.html */ /* http://www.openssl.org/docs/crypto/buffer.html */
if(NULL != buff1) if(buff1)
OPENSSL_free(buff1); OPENSSL_free(buff1);
return result; return result;