From: Jay Satiro <raysatiro@yahoo.com>
Date: Sun, 20 Sep 2015 02:40:40 +0000 (-0400)
Subject: vtls: Change designator name for server's pubkey hash
X-Git-Tag: curl-7_45_0~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47b7d658b45ec1394edb6806c2667cecee13ff10;p=thirdparty%2Fcurl.git

vtls: Change designator name for server's pubkey hash

- Change the designator name we use to show the base64 encoded sha256
hash of the server's public key from 'pinnedpubkey' to
'public key hash'.

Though the server's public key hash is only shown when comparing pinned
public key hashes, the server's hash may not match one of the pinned.
---

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 692ff5c9eb..f359cd5d53 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -797,17 +797,15 @@ CURLcode Curl_pin_peer_pubkey(struct SessionHandle *data,
       return CURLE_OUT_OF_MEMORY;
     curlssl_sha256sum(pubkey, pubkeylen,
                       sha256sumdigest, SHA256_DIGEST_LENGTH);
-
     encode = Curl_base64_encode(data, (char *)sha256sumdigest,
                                 SHA256_DIGEST_LENGTH, &encoded, &encodedlen);
     Curl_safefree(sha256sumdigest);
 
-    if(!encode) {
-      infof(data, "\t pinnedpubkey: sha256//%s\n", encoded);
-    }
-    else
+    if(encode)
       return encode;
 
+    infof(data, "\t public key hash: sha256//%s\n", encoded);
+
     /* it starts with sha256//, copy so we can modify it */
     pinkeylen = strlen(pinnedpubkey) + 1;
     pinkeycopy = malloc(pinkeylen);