]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Revert "Apply the FIPS_eddsa_no_verify_digested indicator on prehash EdDSA only"
authorPauli <ppzgs1@gmail.com>
Wed, 14 Aug 2024 23:49:05 +0000 (09:49 +1000)
committerPauli <ppzgs1@gmail.com>
Fri, 16 Aug 2024 01:32:37 +0000 (11:32 +1000)
This reverts commit ca112fccdd34a8538f14ddf8c3569b8331eae357.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25192)

providers/implementations/signature/eddsa_sig.c

index 223338b420787d772e858289790c915b1e399dc4..9966e96e1556ffa3e577769829279e9f7d6f947f 100644 (file)
@@ -383,10 +383,9 @@ static int ed448_digest_sign(void *vpeddsactx, unsigned char *sigret,
 static int fips_check_verify(PROV_EDDSA_CTX *ctx)
 {
 #ifdef FIPS_MODULE
-    if (ctx->prehash_flag
-        && !OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                        ctx->libctx, "Verify", "EdDSA",
-                                        FIPS_eddsa_no_verify_digested))
+    if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
+                                     ctx->libctx, "Verify", "EdDSA",
+                                     FIPS_eddsa_no_verify_digested))
         return 0;
 #endif  /* FIPS_MODULE */
     return 1;