From: Pauli <ppzgs1@gmail.com>
Date: Wed, 14 Aug 2024 23:49:05 +0000 (+1000)
Subject: Revert "Apply the FIPS_eddsa_no_verify_digested indicator on prehash EdDSA only"
X-Git-Tag: openssl-3.4.0-alpha1~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1348f4b5cff93025713157eea1f5ed228a5c61d6;p=thirdparty%2Fopenssl.git

Revert "Apply the FIPS_eddsa_no_verify_digested indicator on prehash EdDSA only"

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)
---

diff --git a/providers/implementations/signature/eddsa_sig.c b/providers/implementations/signature/eddsa_sig.c
index 223338b4207..9966e96e155 100644
--- a/providers/implementations/signature/eddsa_sig.c
+++ b/providers/implementations/signature/eddsa_sig.c
@@ -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;