]> granicus.if.org Git - curl/commitdiff
vtls: Change designator name for server's pubkey hash
authorJay Satiro <raysatiro@yahoo.com>
Sun, 20 Sep 2015 02:40:40 +0000 (22:40 -0400)
committerJay Satiro <raysatiro@yahoo.com>
Sun, 20 Sep 2015 02:40:40 +0000 (22:40 -0400)
- 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.

lib/vtls/vtls.c

index 692ff5c9eba78d357fc2e3f67b59a33f50c6df31..f359cd5d53d5061358764ad48eb9af68407aae84 100644 (file)
@@ -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);