wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

opensslcoexist fixes: add WOLFSSL_EVP_MD_FLAG_XOF, and use WC_MD4_BLOCK_SIZE, not MD4_BLOCK_SIZE.

Browse Source
This commit is contained in:
Daniel Pouzzner
2025-01-24 20:14:39 -06:00
parent e6b87c2e54
commit f7abd7cb25
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wolfcrypt/src/evp.c
View File

@ -10986,7 +10986,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
#if defined(WOLFSSL_SHA3) && defined(WOLFSSL_SHAKE256) #if defined(WOLFSSL_SHA3) && defined(WOLFSSL_SHAKE256)
case WC_HASH_TYPE_SHAKE256: case WC_HASH_TYPE_SHAKE256:
#endif #endif
return EVP_MD_FLAG_XOF; return WOLFSSL_EVP_MD_FLAG_XOF;
default: default:
return 0; return 0;
} }
@ -11062,7 +11062,7 @@ int wolfSSL_EVP_MD_block_size(const WOLFSSL_EVP_MD* type)
#endif #endif
#ifndef NO_MD4 #ifndef NO_MD4
if (XSTRCMP(type, WC_SN_md4) == 0) { if (XSTRCMP(type, WC_SN_md4) == 0) {
return MD4_BLOCK_SIZE; return WC_MD4_BLOCK_SIZE;
} else } else
#endif #endif
#ifndef NO_MD5 #ifndef NO_MD5
@ -11137,7 +11137,7 @@ int wolfSSL_EVP_MD_size(const WOLFSSL_EVP_MD* type)
#endif #endif
#ifndef NO_MD4 #ifndef NO_MD4
if (XSTRCMP(type, WC_SN_md4) == 0) { if (XSTRCMP(type, WC_SN_md4) == 0) {
return MD4_DIGEST_SIZE; return WC_MD4_DIGEST_SIZE;
} else } else
#endif #endif
#ifndef NO_MD5 #ifndef NO_MD5

3
wolfssl/openssl/evp.h
View File

@ -1150,6 +1150,7 @@ WOLFSSL_API int wolfSSL_EVP_SignInit_ex(WOLFSSL_EVP_MD_CTX* ctx,
#define WOLFSSL_EVP_CTRL_CCM_SET_TAG WOLFSSL_EVP_CTRL_AEAD_SET_TAG #define WOLFSSL_EVP_CTRL_CCM_SET_TAG WOLFSSL_EVP_CTRL_AEAD_SET_TAG
#define WOLFSSL_EVP_CTRL_CCM_SET_L 0x14 #define WOLFSSL_EVP_CTRL_CCM_SET_L 0x14
#define WOLFSSL_EVP_CTRL_CCM_SET_MSGLEN 0x15 #define WOLFSSL_EVP_CTRL_CCM_SET_MSGLEN 0x15
#define WOLFSSL_EVP_MD_FLAG_XOF 0x2
#define WOLFSSL_NO_PADDING_BLOCK_SIZE 1 #define WOLFSSL_NO_PADDING_BLOCK_SIZE 1
@ -1262,7 +1263,7 @@ WOLFSSL_API int wolfSSL_EVP_SignInit_ex(WOLFSSL_EVP_MD_CTX* ctx,
#define EVP_MD_CTX_set_flags(ctx, flags) WC_DO_NOTHING #define EVP_MD_CTX_set_flags(ctx, flags) WC_DO_NOTHING
#endif #endif
#define EVP_MD_FLAG_XOF 0x2 #define EVP_MD_FLAG_XOF WOLFSSL_EVP_MD_FLAG_XOF
#define EVP_Digest wolfSSL_EVP_Digest #define EVP_Digest wolfSSL_EVP_Digest
#define EVP_DigestInit wolfSSL_EVP_DigestInit #define EVP_DigestInit wolfSSL_EVP_DigestInit