]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
pinning: minor code style policing
authorDaniel Stenberg <daniel@haxx.se>
Mon, 13 Oct 2014 20:22:49 +0000 (22:22 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Mon, 13 Oct 2014 20:22:49 +0000 (22:22 +0200)
lib/vtls/gtls.c
lib/vtls/openssl.c

index 6ffe29798a325462b8ff1d00424229a0a456bdf3..6666104b9d3dafc63f095ba9b2b7490d0f3da7a4 100644 (file)
@@ -692,8 +692,11 @@ static CURLcode pkp_pin_peer_pubkey(gnutls_x509_crt_t cert,
   CURLcode result = CURLE_SSL_PINNEDPUBKEYNOTMATCH;
 
   /* if a path wasn't specified, don't pin */
-  if(NULL == pinnedpubkey) return CURLE_OK;
-  if(NULL == cert) return result;
+  if(NULL == pinnedpubkey)
+    return CURLE_OK;
+
+  if(NULL == cert)
+    return result;
 
   do {
     /* 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);
     if(ret != GNUTLS_E_SHORT_MEMORY_BUFFER || len1 == 0)
-        break; /* failed */
+      break; /* failed */
 
     buff1 = malloc(len1);
     if(NULL == buff1)
index 6bf7275a9a0a34346a9825929058d3c8a830a78a..29cc78cad3393b7a9686a30d17476008d488f377 100644 (file)
@@ -2376,8 +2376,11 @@ static CURLcode pkp_pin_peer_pubkey(X509* cert, const char *pinnedpubkey)
   CURLcode result = CURLE_SSL_PINNEDPUBKEYNOTMATCH;
 
   /* if a path wasn't specified, don't pin */
-  if(NULL == pinnedpubkey) return CURLE_OK;
-  if(NULL == cert) return result;
+  if(NULL == pinnedpubkey)
+    return CURLE_OK;
+
+  if(NULL == cert)
+    return result;
 
   do {
     /* Begin Gyrations to get the subjectPublicKeyInfo     */
@@ -2412,7 +2415,7 @@ static CURLcode pkp_pin_peer_pubkey(X509* cert, const char *pinnedpubkey)
   } while(0);
 
   /* http://www.openssl.org/docs/crypto/buffer.html */
-  if(NULL != buff1)
+  if(buff1)
     OPENSSL_free(buff1);
 
   return result;