wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5567 from haydenroche5/hmac_sha1_fix

Browse Source 
Fix HMAC compat layer function for SHA-1.
This commit is contained in:
JacobBarthelmeh
2022-09-09 09:45:21 -06:00
committed by GitHub
parent f7c31dbf64 4deae6dcc6
commit 6526ffc5f8
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ssl.c
View File

@@ -18299,10 +18299,11 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
#endif #endif
#endif #endif
#ifndef NO_SHA #ifndef NO_SHA
if (XSTRCMP(evp_md, "SHA") == 0) { if (XSTRCMP(evp_md, "SHA") == 0 || XSTRCMP(evp_md, "SHA1") == 0) {
type = WC_SHA; type = WC_SHA;
mdlen = WC_SHA_DIGEST_SIZE; mdlen = WC_SHA_DIGEST_SIZE;
} else }
else
#endif #endif
{ {
return NULL; return NULL;

3
tests/api.c
View File

@@ -39202,6 +39202,9 @@ static int test_wolfSSL_HMAC(void)
test_openssl_hmac(EVP_sha3_512(), (int)WC_SHA3_512_DIGEST_SIZE); test_openssl_hmac(EVP_sha3_512(), (int)WC_SHA3_512_DIGEST_SIZE);
#endif #endif
#endif #endif
#ifndef NO_SHA
test_openssl_hmac(EVP_sha1(), (int)WC_SHA_DIGEST_SIZE);
#endif
printf(resultFmt, passed); printf(resultFmt, passed);
#endif #endif

2
wolfssl/openssl/evp.h
View File

@@ -985,8 +985,6 @@ WOLFSSL_API int wolfSSL_EVP_SignInit_ex(WOLFSSL_EVP_MD_CTX* ctx,
#define EVP_get_cipherbynid wolfSSL_EVP_get_cipherbynid #define EVP_get_cipherbynid wolfSSL_EVP_get_cipherbynid
#define EVP_get_digestbynid wolfSSL_EVP_get_digestbynid #define EVP_get_digestbynid wolfSSL_EVP_get_digestbynid
#define EVP_MD_nid wolfSSL_EVP_MD_type #define EVP_MD_nid wolfSSL_EVP_MD_type
#define EVP_get_cipherbyname wolfSSL_EVP_get_cipherbyname
#define EVP_get_digestbyname wolfSSL_EVP_get_digestbyname
#define EVP_PKEY_assign wolfSSL_EVP_PKEY_assign #define EVP_PKEY_assign wolfSSL_EVP_PKEY_assign
#define EVP_PKEY_assign_RSA wolfSSL_EVP_PKEY_assign_RSA #define EVP_PKEY_assign_RSA wolfSSL_EVP_PKEY_assign_RSA