luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: fix pinned public key build error in FIPS mode

Browse Source 
Here is a version that should work with all versions of openssl 0.9.7
through 1.1.0.

Links to the docs:
https://www.openssl.org/docs/man1.0.2/crypto/EVP_DigestInit.html
https://www.openssl.org/docs/man1.1.0/crypto/EVP_DigestInit.html

At the very bottom of the 1.1.0 documentation there is a history section
that states, " stack allocated EVP_MD_CTXs are no longer supported."

If EVP_MD_CTX_create and EVP_MD_CTX_destroy are not defined, then a
simple mapping can be used as described here:
https://wiki.openssl.org/index.php/Talk:OpenSSL_1.1.0_Changes

Closes #2258
This commit is contained in:
McDonough, Tim 2018-01-23 02:24:59 +01:00 committed by Daniel Stenberg
parent 1c00519499
commit 1433e4645b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/vtls/openssl.c
View File

@ -3580,11 +3580,15 @@ static CURLcode Curl_ossl_md5sum(unsigned char *tmp, /* input */
unsigned char *md5sum /* output */, unsigned char *md5sum /* output */,
size_t unused) size_t unused)
{ {
MD5_CTX MD5pw; EVP_MD_CTX *mdctx;
(void)unused; unsigned int len = 0;
MD5_Init(&MD5pw); (void) unused;
MD5_Update(&MD5pw, tmp, tmplen);
MD5_Final(md5sum, &MD5pw); mdctx = EVP_MD_CTX_create();
EVP_DigestInit_ex(mdctx, EVP_md5(), NULL);
EVP_DigestUpdate(mdctx, tmp, tmplen);
EVP_DigestFinal_ex(mdctx, md5sum, &len);
EVP_MD_CTX_destroy(mdctx);
return CURLE_OK; return CURLE_OK;
} }
@ -3594,11 +3598,15 @@ static void Curl_ossl_sha256sum(const unsigned char *tmp, /* input */
unsigned char *sha256sum /* output */, unsigned char *sha256sum /* output */,
size_t unused) size_t unused)
{ {
SHA256_CTX SHA256pw; EVP_MD_CTX *mdctx;
(void)unused; unsigned int len = 0;
SHA256_Init(&SHA256pw); (void) unused;
SHA256_Update(&SHA256pw, tmp, tmplen);
SHA256_Final(sha256sum, &SHA256pw); mdctx = EVP_MD_CTX_create();
EVP_DigestInit_ex(mdctx, EVP_sha256(), NULL);
EVP_DigestUpdate(mdctx, tmp, tmplen);
EVP_DigestFinal_ex(mdctx, sha256sum, &len);
EVP_MD_CTX_destroy(mdctx);
} }
#endif #endif