|
|
|
@ -287,22 +287,6 @@ index 699ada7c52..e534ad0a5f 100644
|
|
|
|
|
return mdnid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -244,5 +254,15 @@ int ossl_digest_is_allowed(OSSL_LIB_CTX *ctx, const EVP_MD *md)
|
|
|
|
|
if (ossl_securitycheck_enabled(ctx))
|
|
|
|
|
return ossl_digest_get_approved_nid(md) != NID_undef;
|
|
|
|
|
# endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
|
|
|
|
|
+
|
|
|
|
|
+#ifndef FIPS_MODULE
|
|
|
|
|
+ {
|
|
|
|
|
+ int mdnid = EVP_MD_nid(md);
|
|
|
|
|
+ if ((mdnid == NID_sha1 || mdnid == NID_md5_sha1)
|
|
|
|
|
+ && !ossl_ctx_legacy_digest_signatures_allowed(ctx, 0))
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ }
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
diff --git a/providers/common/securitycheck_default.c b/providers/common/securitycheck_default.c
|
|
|
|
|
index de7f0d3a0a..ce54a94fbc 100644
|
|
|
|
|
--- a/providers/common/securitycheck_default.c
|
|
|
|
|