diff --git a/tests/api/test_signature.c b/tests/api/test_signature.c index 28b8f3d2dc..25b7ca7dd6 100644 --- a/tests/api/test_signature.c +++ b/tests/api/test_signature.c @@ -41,13 +41,6 @@ #include #include -/* Effective hash floor used by wc_SignatureVerify/Generate; mirrors the - * default in wolfcrypt/src/signature.c. A build may lower it (e.g. - * --enable-wolfclu defines WC_SIG_MIN_HASH_TYPE=WC_HASH_TYPE_MD5). */ -#ifndef WC_SIG_MIN_HASH_TYPE - #define WC_SIG_MIN_HASH_TYPE WC_HASH_TYPE_SHA256 -#endif - /* Testing wc_SignatureGetSize() for signature type ECC */ int test_wc_SignatureGetSize_ecc(void) { diff --git a/wolfcrypt/src/signature.c b/wolfcrypt/src/signature.c index a45bdd0d92..797cfeffb9 100644 --- a/wolfcrypt/src/signature.c +++ b/wolfcrypt/src/signature.c @@ -53,16 +53,6 @@ #endif #endif -/* Minimum hash strength accepted by the wc_SignatureVerify/Generate - * convenience APIs. Default is SHA-256 to keep MD5 and SHA-1 (both with - * known collision attacks) out of new code. Define WC_SIG_MIN_HASH_TYPE - * to a weaker wc_HashType (e.g. WC_HASH_TYPE_SHA) to opt back into legacy - * behavior. The lower-level wc_SignatureVerifyHash/wc_SignatureGenerateHash - * APIs are unaffected. */ -#ifndef WC_SIG_MIN_HASH_TYPE - #define WC_SIG_MIN_HASH_TYPE WC_HASH_TYPE_SHA256 -#endif - static int wc_SignatureCheckHashStrength(enum wc_HashType hash_type) { int min_sz, this_sz; diff --git a/wolfssl/wolfcrypt/signature.h b/wolfssl/wolfcrypt/signature.h index 7f7b2acfab..e036072259 100644 --- a/wolfssl/wolfcrypt/signature.h +++ b/wolfssl/wolfcrypt/signature.h @@ -35,6 +35,16 @@ extern "C" { #endif +/* Minimum hash strength accepted by the wc_SignatureVerify/Generate + * convenience APIs. Default is SHA-256 to keep MD5 and SHA-1 (both with + * known collision attacks) out of new code. Define WC_SIG_MIN_HASH_TYPE + * to a weaker wc_HashType (e.g. WC_HASH_TYPE_SHA) to opt back into legacy + * behavior. The lower-level wc_SignatureVerifyHash/wc_SignatureGenerateHash + * APIs are unaffected. */ +#ifndef WC_SIG_MIN_HASH_TYPE + #define WC_SIG_MIN_HASH_TYPE WC_HASH_TYPE_SHA256 +#endif + enum wc_SignatureType { WC_SIGNATURE_TYPE_NONE = 0, WC_SIGNATURE_TYPE_ECC = 1,