From f7abd7cb2532c867fd598409e15af86ddcf55f59 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Fri, 24 Jan 2025 20:14:39 -0600 Subject: [PATCH] opensslcoexist fixes: add WOLFSSL_EVP_MD_FLAG_XOF, and use WC_MD4_BLOCK_SIZE, not MD4_BLOCK_SIZE. --- wolfcrypt/src/evp.c | 6 +++--- wolfssl/openssl/evp.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c index ab0d34977..abc79d999 100644 --- a/wolfcrypt/src/evp.c +++ b/wolfcrypt/src/evp.c @@ -10986,7 +10986,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type) #if defined(WOLFSSL_SHA3) && defined(WOLFSSL_SHAKE256) case WC_HASH_TYPE_SHAKE256: #endif - return EVP_MD_FLAG_XOF; + return WOLFSSL_EVP_MD_FLAG_XOF; default: return 0; } @@ -11062,7 +11062,7 @@ int wolfSSL_EVP_MD_block_size(const WOLFSSL_EVP_MD* type) #endif #ifndef NO_MD4 if (XSTRCMP(type, WC_SN_md4) == 0) { - return MD4_BLOCK_SIZE; + return WC_MD4_BLOCK_SIZE; } else #endif #ifndef NO_MD5 @@ -11137,7 +11137,7 @@ int wolfSSL_EVP_MD_size(const WOLFSSL_EVP_MD* type) #endif #ifndef NO_MD4 if (XSTRCMP(type, WC_SN_md4) == 0) { - return MD4_DIGEST_SIZE; + return WC_MD4_DIGEST_SIZE; } else #endif #ifndef NO_MD5 diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h index b784d38b1..c47709c87 100644 --- a/wolfssl/openssl/evp.h +++ b/wolfssl/openssl/evp.h @@ -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_L 0x14 #define WOLFSSL_EVP_CTRL_CCM_SET_MSGLEN 0x15 +#define WOLFSSL_EVP_MD_FLAG_XOF 0x2 #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 #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_DigestInit wolfSSL_EVP_DigestInit