moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

vtls: switch to CURL_SHA256_DIGEST_LENGTH define

Browse Source 
... instead of the prefix-less version since WolfSSL 3.12 now uses an
enum with that name that causes build failures for us.

Fixes #1865
Closes #1867
Reported-by: Gisle Vanem
This commit is contained in:
Daniel Stenberg 2017-09-06 09:32:02 +02:00
parent 6b585b1183
commit 4bb80d532e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vtls/darwinssl.c
View File

@ -2780,7 +2780,7 @@ static void Curl_darwinssl_sha256sum(const unsigned char *tmp, /* input */
unsigned char *sha256sum, /* output */ unsigned char *sha256sum, /* output */
size_t sha256len) size_t sha256len)
{ {
assert(sha256len >= SHA256_DIGEST_LENGTH); assert(sha256len >= CURL_SHA256_DIGEST_LENGTH);
(void)CC_SHA256(tmp, (CC_LONG)tmplen, sha256sum); (void)CC_SHA256(tmp, (CC_LONG)tmplen, sha256sum);
} }

7
lib/vtls/vtls.c
View File

@ -815,13 +815,14 @@ CURLcode Curl_pin_peer_pubkey(struct Curl_easy *data,
} }
/* compute sha256sum of public key */ /* compute sha256sum of public key */
sha256sumdigest = malloc(SHA256_DIGEST_LENGTH); sha256sumdigest = malloc(CURL_SHA256_DIGEST_LENGTH);
if(!sha256sumdigest) if(!sha256sumdigest)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
Curl_ssl->sha256sum(pubkey, pubkeylen, Curl_ssl->sha256sum(pubkey, pubkeylen,
sha256sumdigest, SHA256_DIGEST_LENGTH); sha256sumdigest, CURL_SHA256_DIGEST_LENGTH);
encode = Curl_base64_encode(data, (char *)sha256sumdigest, encode = Curl_base64_encode(data, (char *)sha256sumdigest,
SHA256_DIGEST_LENGTH, &encoded, &encodedlen); CURL_SHA256_DIGEST_LENGTH, &encoded,
&encodedlen);
Curl_safefree(sha256sumdigest); Curl_safefree(sha256sumdigest);
if(encode) if(encode)

6
lib/vtls/vtls.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -116,8 +116,8 @@ CURLcode Curl_none_md5sum(unsigned char *input, size_t inputlen,
#define MD5_DIGEST_LENGTH 16 /* fixed size */ #define MD5_DIGEST_LENGTH 16 /* fixed size */
#endif #endif
#ifndef SHA256_DIGEST_LENGTH #ifndef CURL_SHA256_DIGEST_LENGTH
#define SHA256_DIGEST_LENGTH 32 /* fixed size */ #define CURL_SHA256_DIGEST_LENGTH 32 /* fixed size */
#endif #endif
/* see https://tools.ietf.org/html/draft-ietf-tls-applayerprotoneg-04 */ /* see https://tools.ietf.org/html/draft-ietf-tls-applayerprotoneg-04 */