.gitignore

@@ -1 +1,2 @@
+SOURCES/0126-pkeyutl-encap.patch
 SOURCES/openssl-3.2.2.tar.gz

.openssl.metadata

@@ -1 +1,2 @@
+15c306c268c632e3e317300ea623a901baaa1b0c SOURCES/0126-pkeyutl-encap.patch
 b12311372a0277ca0eb218a68a7fd9f5ce66d162 SOURCES/openssl-3.2.2.tar.gz

SOURCES/0003-Do-not-install-html-docs.patch

@@ -1,15 +1,19 @@
-From 3d5755df8d09ca841c0aca2d7344db060f6cc97f Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Thu, 24 Sep 2020 09:05:55 +0200
-Subject: Do not install html docs
+From a3e7963320ba44e96a60b389fccb8e1cccc30674 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 19 Oct 2023 13:12:39 +0200
+Subject: [PATCH 03/46] 0003-Do-not-install-html-docs.patch
 
-(was openssl-1.1.1-no-html.patch)
+Patch-name: 0003-Do-not-install-html-docs.patch
+Patch-id: 3
+Patch-status: |
+    # # Do not install html docs
+From-dist-git-commit: 5c67b5adc311af297f425c09e3e1ac7ca8483911
 ---
  Configurations/unix-Makefile.tmpl | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 342e46d24d..9f369edf0e 100644
+index a48fae5fb8..56b42926e7 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
 @@ -611,7 +611,7 @@ install_sw: install_dev install_engines install_modules install_runtime
@@ -22,5 +26,5 @@ index 342e46d24d..9f369edf0e 100644
  uninstall_docs: uninstall_man_docs uninstall_html_docs ## Uninstall manpages and HTML documentation
  	$(RM) -r "$(DESTDIR)$(DOCDIR)"
 -- 
-2.26.2
+2.41.0
 

SOURCES/0004-Override-default-paths-for-the-CA-directory-tree.patch

@@ -1,14 +1,14 @@
-From 6790960076742a9053c624e26fbb87fcd5789e27 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Thu, 24 Sep 2020 09:17:26 +0200
-Subject: Override default paths for the CA directory tree
+From 7a65ee33793fa8a28c0dfc94e6872ce92f408b15 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 31 Jul 2023 09:41:27 +0200
+Subject: [PATCH 04/35] 
+ 0004-Override-default-paths-for-the-CA-directory-tree.patch
 
-Also add default section to load crypto-policies configuration
-for TLS.
-
-It needs to be reverted before running tests.
-
-(was openssl-1.1.1-conf-paths.patch)
+Patch-name: 0004-Override-default-paths-for-the-CA-directory-tree.patch
+Patch-id: 4
+Patch-status: |
+    # Override default paths for the CA directory tree
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
 ---
  apps/CA.pl.in    |  2 +-
  apps/openssl.cnf | 20 ++++++++++++++++++--

SOURCES/0007-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch

@@ -1,9 +1,14 @@
-From 736d709ec194b3a763e004696df22792c62a11fc Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Thu, 24 Sep 2020 10:16:46 +0200
-Subject: Add support for PROFILE=SYSTEM system default cipherlist
+From 8be4ef77c64fcada41041c00e02c34b07658ba66 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 6 Mar 2024 19:17:14 +0100
+Subject: [PATCH 07/49] 
+ 0007-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
 
-(was openssl-1.1.1-system-cipherlist.patch)
+Patch-name: 0007-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
+Patch-id: 7
+Patch-status: |
+    # # Add support for PROFILE=SYSTEM system default cipherlist
+From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
 ---
  Configurations/unix-Makefile.tmpl |  5 ++
  Configure                         | 11 +++-
@@ -15,7 +20,7 @@ Subject: Add support for PROFILE=SYSTEM system default cipherlist
  7 files changed, 109 insertions(+), 13 deletions(-)
 
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 9f369edf0e..c52389f831 100644
+index 5d61ce9550..e9fba957f1 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
 @@ -324,6 +324,10 @@ MANDIR=$(INSTALLTOP)/share/man
@@ -81,7 +86,7 @@ index cca1ac8d16..2ae1cd0bc2 100755
                          {
                          $banner = $1 . "\n";
 diff --git a/doc/man1/openssl-ciphers.pod.in b/doc/man1/openssl-ciphers.pod.in
-index b4ed3e51d5..2122e6bdfd 100644
+index d4df30686f..cec4835268 100644
 --- a/doc/man1/openssl-ciphers.pod.in
 +++ b/doc/man1/openssl-ciphers.pod.in
 @@ -190,6 +190,15 @@ As of OpenSSL 1.0.0, the B<ALL> cipher suites are sensibly ordered by default.
@@ -101,7 +106,7 @@ index b4ed3e51d5..2122e6bdfd 100644
  
  "High" encryption cipher suites. This currently means those with key lengths
 diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
-index f9a61609e4..c6f95fed3f 100644
+index 9f91039f8a..fc34d4ca61 100644
 --- a/include/openssl/ssl.h.in
 +++ b/include/openssl/ssl.h.in
 @@ -209,6 +209,11 @@ extern "C" {
@@ -117,7 +122,7 @@ index f9a61609e4..c6f95fed3f 100644
  /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
  # define SSL_SENT_SHUTDOWN       1
 diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
-index b1d3f7919e..f7cc7fed48 100644
+index 8360991ce4..33c23efb0d 100644
 --- a/ssl/ssl_ciph.c
 +++ b/ssl/ssl_ciph.c
 @@ -1455,6 +1455,53 @@ int SSL_set_ciphersuites(SSL *s, const char *str)
@@ -174,7 +179,7 @@ index b1d3f7919e..f7cc7fed48 100644
  STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
                                               STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
                                               STACK_OF(SSL_CIPHER) **cipher_list,
-@@ -1425,15 +1472,25 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+@@ -1469,15 +1516,25 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
      CIPHER_ORDER *co_list = NULL, *head = NULL, *tail = NULL, *curr;
      const SSL_CIPHER **ca_list = NULL;
      const SSL_METHOD *ssl_method = ctx->method;
@@ -211,7 +216,7 @@ index b1d3f7919e..f7cc7fed48 100644
      }
  
      ssl_cipher_collect_ciphers(ssl_method, num_of_ciphers,
-@@ -1522,8 +1579,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+@@ -1565,8 +1622,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
       * in force within each class
       */
      if (!ssl_cipher_strength_sort(&head, &tail)) {
@@ -221,16 +226,17 @@ index b1d3f7919e..f7cc7fed48 100644
      }
  
      /*
-@@ -1611,7 +1667,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+@@ -1611,8 +1667,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+     num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1;
      ca_list = OPENSSL_malloc(sizeof(*ca_list) * num_of_alias_max);
      if (ca_list == NULL) {
-         OPENSSL_free(co_list);
+-        OPENSSL_free(co_list);
 -        return NULL;          /* Failure */
 +        goto err;
      }
      ssl_cipher_collect_aliases(ca_list, num_of_group_aliases,
                                 disabled_mkey, disabled_auth, disabled_enc,
-@@ -1596,8 +1651,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+@@ -1637,8 +1693,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
      OPENSSL_free(ca_list);      /* Not needed anymore */
  
      if (!ok) {                  /* Rule processing failure */
@@ -240,7 +246,7 @@ index b1d3f7919e..f7cc7fed48 100644
      }
  
      /*
-@@ -1605,10 +1659,13 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+@@ -1646,10 +1701,13 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
       * if we cannot get one.
       */
      if ((cipherstack = sk_SSL_CIPHER_new_null()) == NULL) {
@@ -256,7 +262,7 @@ index b1d3f7919e..f7cc7fed48 100644
      /* Add TLSv1.3 ciphers first - we always prefer those if possible */
      for (i = 0; i < sk_SSL_CIPHER_num(tls13_ciphersuites); i++) {
          const SSL_CIPHER *sslc = sk_SSL_CIPHER_value(tls13_ciphersuites, i);
-@@ -1656,6 +1714,14 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+@@ -1701,6 +1759,14 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
      *cipher_list = cipherstack;
  
      return cipherstack;
@@ -272,10 +278,10 @@ index b1d3f7919e..f7cc7fed48 100644
  
  char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
 diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
-index d14d5819ba..48d491219a 100644
+index cf59d2dfa5..1329841aaf 100644
 --- a/ssl/ssl_lib.c
 +++ b/ssl/ssl_lib.c
-@@ -660,7 +660,7 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth)
+@@ -700,7 +700,7 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth)
                                  ctx->tls13_ciphersuites,
                                  &(ctx->cipher_list),
                                  &(ctx->cipher_list_by_id),
@@ -284,7 +290,7 @@ index d14d5819ba..48d491219a 100644
      if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0)) {
          ERR_raise(ERR_LIB_SSL, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS);
          return 0;
-@@ -3193,7 +3193,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
+@@ -3966,7 +3966,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
      if (!ssl_create_cipher_list(ret,
                                  ret->tls13_ciphersuites,
                                  &ret->cipher_list, &ret->cipher_list_by_id,
@@ -294,10 +300,10 @@ index d14d5819ba..48d491219a 100644
          ERR_raise(ERR_LIB_SSL, SSL_R_LIBRARY_HAS_NO_CIPHERS);
          goto err;
 diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c
-index 380f0727fc..6922a87c30 100644
+index c46e431b00..19d05e860b 100644
 --- a/test/cipherlist_test.c
 +++ b/test/cipherlist_test.c
-@@ -244,7 +244,9 @@ end:
+@@ -261,7 +261,9 @@ end:
  
  int setup_tests(void)
  {
@@ -308,5 +314,5 @@ index 380f0727fc..6922a87c30 100644
      ADD_TEST(test_default_cipherlist_clear);
      ADD_TEST(test_stdname_cipherlist);
 -- 
-2.26.2
+2.44.0
 

SOURCES/0008-Add-FIPS_mode-compatibility-macro.patch

@@ -1,20 +1,22 @@
-From 5b2ec9a54037d7b007324bf53e067e73511cdfe4 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Thu, 26 Nov 2020 14:00:16 +0100
-Subject: Add FIPS_mode() compatibility macro
+From 8e29a10b39a649d751870eb1fd1b8c388e66acc3 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 31 Jul 2023 09:41:27 +0200
+Subject: [PATCH 08/35] 0008-Add-FIPS_mode-compatibility-macro.patch
 
-The macro calls EVP_default_properties_is_fips_enabled() on the
-default context.
+Patch-name: 0008-Add-FIPS_mode-compatibility-macro.patch
+Patch-id: 8
+Patch-status: |
+    # Add FIPS_mode() compatibility macro
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
 ---
- include/openssl/crypto.h.in |  1 +
- include/openssl/fips.h      | 25 +++++++++++++++++++++++++
- test/property_test.c        | 13 +++++++++++++
- 3 files changed, 39 insertions(+)
+ include/openssl/fips.h | 26 ++++++++++++++++++++++++++
+ test/property_test.c   | 14 ++++++++++++++
+ 2 files changed, 40 insertions(+)
  create mode 100644 include/openssl/fips.h
 
 diff --git a/include/openssl/fips.h b/include/openssl/fips.h
 new file mode 100644
-index 0000000000..c64f0f8e8f
+index 0000000000..4162cbf88e
 --- /dev/null
 +++ b/include/openssl/fips.h
 @@ -0,0 +1,26 @@
@@ -44,13 +46,14 @@ index 0000000000..c64f0f8e8f
 +}
 +# endif
 +#endif
-diff -up openssl-3.0.0-beta1/test/property_test.c.fips-macro openssl-3.0.0-beta1/test/property_test.c
---- openssl-3.0.0-beta1/test/property_test.c.fips-macro	2021-06-29 12:14:58.851557698 +0200
-+++ openssl-3.0.0-beta1/test/property_test.c	2021-06-29 12:17:14.630143832 +0200
-@@ -488,6 +488,19 @@ static int test_property_list_to_string(
+diff --git a/test/property_test.c b/test/property_test.c
+index 45b1db3e85..8894c1c1cb 100644
+--- a/test/property_test.c
++++ b/test/property_test.c
+@@ -677,6 +677,19 @@ static int test_property_list_to_string(int i)
      return ret;
  }
-
+ 
 +#include <openssl/fips.h>
 +static int test_downstream_FIPS_mode(void)
 +{
@@ -67,7 +70,7 @@ diff -up openssl-3.0.0-beta1/test/property_test.c.fips-macro openssl-3.0.0-beta1
  int setup_tests(void)
  {
      ADD_TEST(test_property_string);
-@@ -500,6 +512,7 @@ int setup_tests(void)
+@@ -690,6 +703,7 @@ int setup_tests(void)
      ADD_TEST(test_property);
      ADD_TEST(test_query_cache_stochastic);
      ADD_TEST(test_fips_mode);
@@ -75,3 +78,6 @@ diff -up openssl-3.0.0-beta1/test/property_test.c.fips-macro openssl-3.0.0-beta1
      ADD_ALL_TESTS(test_property_list_to_string, OSSL_NELEM(to_string_tests));
      return 1;
  }
+-- 
+2.41.0
+

SOURCES/0012-Disable-explicit-ec.patch

@@ -1,7 +1,27 @@
-diff -up openssl-3.0.1/crypto/ec/ec_asn1.c.disable_explicit_ec openssl-3.0.1/crypto/ec/ec_asn1.c
---- openssl-3.0.1/crypto/ec/ec_asn1.c.disable_explicit_ec	2022-03-22 13:10:45.718077845 +0100
-+++ openssl-3.0.1/crypto/ec/ec_asn1.c	2022-03-22 13:12:46.626599016 +0100
-@@ -895,6 +895,12 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **
+From 91bdd9b816b22bc1464ec323f3272b866b24114d Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 31 Jul 2023 09:41:28 +0200
+Subject: [PATCH 12/35] 0012-Disable-explicit-ec.patch
+
+Patch-name: 0012-Disable-explicit-ec.patch
+Patch-id: 12
+Patch-status: |
+    # Disable explicit EC curves
+    # https://bugzilla.redhat.com/show_bug.cgi?id=2066412
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
+---
+ crypto/ec/ec_asn1.c                           | 11 ++++++++++
+ crypto/ec/ec_lib.c                            |  6 +++++
+ test/ectest.c                                 | 22 ++++++++++---------
+ test/endecode_test.c                          | 20 ++++++++---------
+ .../30-test_evp_data/evppkey_ecdsa.txt        | 12 ----------
+ 5 files changed, 39 insertions(+), 32 deletions(-)
+
+diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
+index 7a0b35a594..d19d57344e 100644
+--- a/crypto/ec/ec_asn1.c
++++ b/crypto/ec/ec_asn1.c
+@@ -905,6 +905,12 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len)
      if (params->type == ECPKPARAMETERS_TYPE_EXPLICIT)
          group->decoded_from_explicit_params = 1;
  
@@ -14,7 +34,7 @@ diff -up openssl-3.0.1/crypto/ec/ec_asn1.c.disable_explicit_ec openssl-3.0.1/cry
      if (a) {
          EC_GROUP_free(*a);
          *a = group;
-@@ -954,6 +959,11 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, con
+@@ -964,6 +970,11 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
          goto err;
      }
  
@@ -114,10 +134,11 @@ index 4890b0555e..e11aec5b3b 100644
      ret = 1;
  
   err:
-diff -up openssl-3.0.1/test/endecode_test.c.disable_explicit_ec openssl-3.0.1/test/endecode_test.c
---- openssl-3.0.1/test/endecode_test.c.disable_explicit_ec	2022-03-21 16:55:46.005558779 +0100
-+++ openssl-3.0.1/test/endecode_test.c	2022-03-21 16:56:12.636792762 +0100
-@@ -57,7 +57,7 @@ static BN_CTX *bnctx = NULL;
+diff --git a/test/endecode_test.c b/test/endecode_test.c
+index 14648287eb..9a437d8c64 100644
+--- a/test/endecode_test.c
++++ b/test/endecode_test.c
+@@ -62,7 +62,7 @@ static BN_CTX *bnctx = NULL;
  static OSSL_PARAM_BLD *bld_prime_nc = NULL;
  static OSSL_PARAM_BLD *bld_prime = NULL;
  static OSSL_PARAM *ec_explicit_prime_params_nc = NULL;
@@ -126,7 +147,7 @@ diff -up openssl-3.0.1/test/endecode_test.c.disable_explicit_ec openssl-3.0.1/te
  
  # ifndef OPENSSL_NO_EC2M
  static OSSL_PARAM_BLD *bld_tri_nc = NULL;
-@@ -990,9 +990,9 @@ IMPLEMENT_TEST_SUITE_LEGACY(EC, "EC")
+@@ -1009,9 +1009,9 @@ IMPLEMENT_TEST_SUITE_LEGACY(EC, "EC")
  DOMAIN_KEYS(ECExplicitPrimeNamedCurve);
  IMPLEMENT_TEST_SUITE(ECExplicitPrimeNamedCurve, "EC", 1)
  IMPLEMENT_TEST_SUITE_LEGACY(ECExplicitPrimeNamedCurve, "EC")
@@ -139,7 +160,7 @@ diff -up openssl-3.0.1/test/endecode_test.c.disable_explicit_ec openssl-3.0.1/te
  # ifndef OPENSSL_NO_EC2M
  DOMAIN_KEYS(ECExplicitTriNamedCurve);
  IMPLEMENT_TEST_SUITE(ECExplicitTriNamedCurve, "EC", 1)
-@@ -1318,7 +1318,7 @@ int setup_tests(void)
+@@ -1352,7 +1352,7 @@ int setup_tests(void)
          || !create_ec_explicit_prime_params_namedcurve(bld_prime_nc)
          || !create_ec_explicit_prime_params(bld_prime)
          || !TEST_ptr(ec_explicit_prime_params_nc = OSSL_PARAM_BLD_to_param(bld_prime_nc))
@@ -148,7 +169,7 @@ diff -up openssl-3.0.1/test/endecode_test.c.disable_explicit_ec openssl-3.0.1/te
  # ifndef OPENSSL_NO_EC2M
          || !TEST_ptr(bld_tri_nc = OSSL_PARAM_BLD_new())
          || !TEST_ptr(bld_tri = OSSL_PARAM_BLD_new())
-@@ -1346,7 +1346,7 @@ int setup_tests(void)
+@@ -1380,7 +1380,7 @@ int setup_tests(void)
      TEST_info("Generating EC keys...");
      MAKE_DOMAIN_KEYS(EC, "EC", EC_params);
      MAKE_DOMAIN_KEYS(ECExplicitPrimeNamedCurve, "EC", ec_explicit_prime_params_nc);
@@ -157,7 +178,7 @@ diff -up openssl-3.0.1/test/endecode_test.c.disable_explicit_ec openssl-3.0.1/te
  # ifndef OPENSSL_NO_EC2M
      MAKE_DOMAIN_KEYS(ECExplicitTriNamedCurve, "EC", ec_explicit_tri_params_nc);
      MAKE_DOMAIN_KEYS(ECExplicitTri2G, "EC", ec_explicit_tri_params_explicit);
-@@ -1389,8 +1389,8 @@ int setup_tests(void)
+@@ -1423,8 +1423,8 @@ int setup_tests(void)
          ADD_TEST_SUITE_LEGACY(EC);
          ADD_TEST_SUITE(ECExplicitPrimeNamedCurve);
          ADD_TEST_SUITE_LEGACY(ECExplicitPrimeNamedCurve);
@@ -168,7 +189,7 @@ diff -up openssl-3.0.1/test/endecode_test.c.disable_explicit_ec openssl-3.0.1/te
  # ifndef OPENSSL_NO_EC2M
          ADD_TEST_SUITE(ECExplicitTriNamedCurve);
          ADD_TEST_SUITE_LEGACY(ECExplicitTriNamedCurve);
-@@ -1427,7 +1427,7 @@ void cleanup_tests(void)
+@@ -1461,7 +1461,7 @@ void cleanup_tests(void)
  {
  #ifndef OPENSSL_NO_EC
      OSSL_PARAM_free(ec_explicit_prime_params_nc);
@@ -177,7 +198,7 @@ diff -up openssl-3.0.1/test/endecode_test.c.disable_explicit_ec openssl-3.0.1/te
      OSSL_PARAM_BLD_free(bld_prime_nc);
      OSSL_PARAM_BLD_free(bld_prime);
  # ifndef OPENSSL_NO_EC2M
-@@ -1449,7 +1449,7 @@ void cleanup_tests(void)
+@@ -1483,7 +1483,7 @@ void cleanup_tests(void)
  #ifndef OPENSSL_NO_EC
      FREE_DOMAIN_KEYS(EC);
      FREE_DOMAIN_KEYS(ECExplicitPrimeNamedCurve);
@@ -186,10 +207,11 @@ diff -up openssl-3.0.1/test/endecode_test.c.disable_explicit_ec openssl-3.0.1/te
  # ifndef OPENSSL_NO_EC2M
      FREE_DOMAIN_KEYS(ECExplicitTriNamedCurve);
      FREE_DOMAIN_KEYS(ECExplicitTri2G);
-diff -up openssl-3.0.1/test/recipes/30-test_evp_data/evppkey_ecdsa.txt.disable_explicit_ec openssl-3.0.1/test/recipes/30-test_evp_data/evppkey_ecdsa.txt
---- openssl-3.0.1/test/recipes/30-test_evp_data/evppkey_ecdsa.txt.disable_explicit_ec	2022-03-25 11:20:50.920949208 +0100
-+++ openssl-3.0.1/test/recipes/30-test_evp_data/evppkey_ecdsa.txt	2022-03-25 11:21:13.177147598 +0100
-@@ -121,18 +121,6 @@ AAAA//////////+85vqtpxeehPO5ysL8YyVRAgEB
+diff --git a/test/recipes/30-test_evp_data/evppkey_ecdsa.txt b/test/recipes/30-test_evp_data/evppkey_ecdsa.txt
+index ec3c032aba..584ecee0eb 100644
+--- a/test/recipes/30-test_evp_data/evppkey_ecdsa.txt
++++ b/test/recipes/30-test_evp_data/evppkey_ecdsa.txt
+@@ -133,18 +133,6 @@ AAAA//////////+85vqtpxeehPO5ysL8YyVRAgEBBG0wawIBAQQgiUTxtr5vLVjj
  3ev1gTwRBduzqqlwd54AUSgI+pjttW8zrWNitO8H1sf59MPWOESKxNtZ1+Nl
  -----END PRIVATE KEY-----
  
@@ -208,3 +230,6 @@ diff -up openssl-3.0.1/test/recipes/30-test_evp_data/evppkey_ecdsa.txt.disable_e
  PrivateKey = B-163
  -----BEGIN PRIVATE KEY-----
  MGMCAQAwEAYHKoZIzj0CAQYFK4EEAA8ETDBKAgEBBBUDnQW0mLiHVha/jqFznX/K
+-- 
+2.41.0
+

SOURCES/0013-skipped-tests-EC-curves.patch

@@ -1,7 +1,24 @@
-diff -up ./test/recipes/15-test_ec.t.skip-tests ./test/recipes/15-test_ec.t
---- ./test/recipes/15-test_ec.t.skip-tests	2023-03-14 13:42:38.865508269 +0100
-+++ ./test/recipes/15-test_ec.t	2023-03-14 13:43:36.237021635 +0100
-@@ -90,7 +90,7 @@ subtest 'Ed448 conversions -- public key
+From 9ede2b1e13f72db37718853faff74b4429084d59 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 31 Jul 2023 09:41:28 +0200
+Subject: [PATCH 13/35] 0013-skipped-tests-EC-curves.patch
+
+Patch-name: 0013-skipped-tests-EC-curves.patch
+Patch-id: 13
+Patch-status: |
+    # Skipped tests from former 0011-Remove-EC-curves.patch
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
+---
+ test/recipes/15-test_ec.t          | 2 +-
+ test/recipes/65-test_cmp_protect.t | 2 +-
+ test/recipes/65-test_cmp_vfy.t     | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/recipes/15-test_ec.t b/test/recipes/15-test_ec.t
+index 0638d626e7..c0efd77649 100644
+--- a/test/recipes/15-test_ec.t
++++ b/test/recipes/15-test_ec.t
+@@ -90,7 +90,7 @@ subtest 'Ed448 conversions -- public key' => sub {
  
  subtest 'Check loading of fips and non-fips keys' => sub {
      plan skip_all => "FIPS is disabled"
@@ -10,10 +27,11 @@ diff -up ./test/recipes/15-test_ec.t.skip-tests ./test/recipes/15-test_ec.t
  
      plan tests => 2;
  
-diff -up ./test/recipes/65-test_cmp_protect.t.skip-tests ./test/recipes/65-test_cmp_protect.t
---- ./test/recipes/65-test_cmp_protect.t.skip-tests	2023-03-14 10:13:11.342056559 +0100
-+++ ./test/recipes/65-test_cmp_protect.t	2023-03-14 10:14:42.643873496 +0100
-@@ -27,7 +27,7 @@ plan skip_all => "This test is not suppo
+diff --git a/test/recipes/65-test_cmp_protect.t b/test/recipes/65-test_cmp_protect.t
+index 631603df7c..4cb2ffebbc 100644
+--- a/test/recipes/65-test_cmp_protect.t
++++ b/test/recipes/65-test_cmp_protect.t
+@@ -27,7 +27,7 @@ plan skip_all => "This test is not supported in a no-cmp build"
  plan skip_all => "This test is not supported in a shared library build on Windows"
      if $^O eq 'MSWin32' && !disabled("shared");
  
@@ -35,3 +53,6 @@ index f722800e27..26a01786bb 100644
  
  my @basic_cmd = ("cmp_vfy_test",
                   data_file("server.crt"),     data_file("client.crt"),
+-- 
+2.41.0
+

SOURCES/0024-load-legacy-prov.patch

@@ -1,3 +1,18 @@
+From 69636828729ecc287863366dcdd6548dee78c7a4 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 31 Jul 2023 09:41:28 +0200
+Subject: [PATCH 14/35] 0024-load-legacy-prov.patch
+
+Patch-name: 0024-load-legacy-prov.patch
+Patch-id: 24
+Patch-status: |
+    # Instructions to load legacy provider in openssl.cnf
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
+---
+ apps/openssl.cnf    | 37 +++++++++++++++----------------------
+ doc/man5/config.pod |  8 ++++++++
+ 2 files changed, 23 insertions(+), 22 deletions(-)
+
 diff -up openssl-3.0.0/apps/openssl.cnf.legacy-prov openssl-3.0.0/apps/openssl.cnf
 --- openssl-3.0.0/apps/openssl.cnf.legacy-prov	2021-09-09 12:06:40.895793297 +0200
 +++ openssl-3.0.0/apps/openssl.cnf	2021-09-09 12:12:33.947482500 +0200

SOURCES/0035-speed-skip-unavailable-dgst.patch

@@ -1,7 +1,22 @@
-diff -up openssl-3.0.0/apps/speed.c.beldmit openssl-3.0.0/apps/speed.c
---- openssl-3.0.0/apps/speed.c.beldmit	2021-12-21 15:14:04.210431584 +0100
-+++ openssl-3.0.0/apps/speed.c	2021-12-21 15:46:05.554085125 +0100
-@@ -547,6 +547,9 @@ static int EVP_MAC_loop(int algindex, vo
+From 213f38dc580d39f2cb46592b5e6db585fc6a650f Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 31 Jul 2023 09:41:28 +0200
+Subject: [PATCH 19/35] 0035-speed-skip-unavailable-dgst.patch
+
+Patch-name: 0035-speed-skip-unavailable-dgst.patch
+Patch-id: 35
+Patch-status: |
+    # Skip unavailable algorithms running `openssl speed`
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
+---
+ apps/speed.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/apps/speed.c b/apps/speed.c
+index d527f12f18..2ff3eb53bd 100644
+--- a/apps/speed.c
++++ b/apps/speed.c
+@@ -610,6 +610,9 @@ static int EVP_MAC_loop(int algindex, void *args)
      for (count = 0; COND(c[algindex][testnum]); count++) {
          size_t outl;
  
@@ -11,3 +26,6 @@ diff -up openssl-3.0.0/apps/speed.c.beldmit openssl-3.0.0/apps/speed.c
          if (!EVP_MAC_init(mctx, NULL, 0, NULL)
              || !EVP_MAC_update(mctx, buf, lengths[testnum])
              || !EVP_MAC_final(mctx, mac, &outl, sizeof(mac)))
+-- 
+2.41.0
+

SOURCES/0044-FIPS-140-3-keychecks.patch

@@ -383,6 +383,8 @@ index cd5de6bd51..d4261e8f7d 100644
  const OSSL_DISPATCH ossl_rsa_signature_functions[] = {
      { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))rsa_newctx },
      { OSSL_FUNC_SIGNATURE_SIGN_INIT, (void (*)(void))rsa_sign_init },
+-- 
+2.41.0
 diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
 index e0d139d..35f23b2 100644
 --- a/crypto/rsa/rsa_gen.c

SOURCES/0045-FIPS-services-minimize.patch

@@ -1,13 +1,12 @@
-From e25b25227043a2b2cf156527c31d7686a4265bf3 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 6 Mar 2024 19:17:15 +0100
-Subject: [PATCH 20/49] 0045-FIPS-services-minimize.patch
+From a9dc983f82cabe29d6b48f3af3e30e26074ce5cf Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 12:55:57 +0200
+Subject: [PATCH 21/48] 0045-FIPS-services-minimize.patch
 
 Patch-name: 0045-FIPS-services-minimize.patch
 Patch-id: 45
 Patch-status: |
-    # # Minimize fips services
-From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
+    # Minimize fips services
 ---
  apps/ecparam.c                                |  7 +++
  apps/req.c                                    |  2 +-
@@ -21,14 +20,14 @@ From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
  test/evp_libctx_test.c                        |  9 +++-
  test/recipes/15-test_gendsa.t                 |  2 +-
  test/recipes/20-test_cli_fips.t               |  3 +-
- test/recipes/30-test_evp.t                    | 20 ++++-----
+ test/recipes/30-test_evp.t                    | 16 +++----
  .../30-test_evp_data/evpmac_common.txt        | 22 ++++++++++
  test/recipes/80-test_cms.t                    | 22 +++++-----
  test/recipes/80-test_ssl_old.t                |  2 +-
- 16 files changed, 128 insertions(+), 51 deletions(-)
+ 16 files changed, 128 insertions(+), 47 deletions(-)
 
 diff --git a/apps/ecparam.c b/apps/ecparam.c
-index 71f93c4ca5..347bf62d5c 100644
+index 9e9ad13683..9c66cf2434 100644
 --- a/apps/ecparam.c
 +++ b/apps/ecparam.c
 @@ -79,6 +79,13 @@ static int list_builtin_curves(BIO *out)
@@ -46,10 +45,10 @@ index 71f93c4ca5..347bf62d5c 100644
              comment = "CURVE DESCRIPTION NOT AVAILABLE";
          if (sname == NULL)
 diff --git a/apps/req.c b/apps/req.c
-index 8995453dca..cb38e6aa64 100644
+index 23757044ab..5916914978 100644
 --- a/apps/req.c
 +++ b/apps/req.c
-@@ -268,7 +268,7 @@ int req_main(int argc, char **argv)
+@@ -266,7 +266,7 @@ int req_main(int argc, char **argv)
      unsigned long chtype = MBSTRING_ASC, reqflag = 0;
  
  #ifndef OPENSSL_NO_DES
@@ -59,10 +58,10 @@ index 8995453dca..cb38e6aa64 100644
  
      opt_set_unknown_name("digest");
 diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c
-index f7234615e4..0d4c0e3388 100644
+index ed37e76969..eb836dfa6a 100644
 --- a/providers/common/capabilities.c
 +++ b/providers/common/capabilities.c
-@@ -189,9 +189,9 @@ static const OSSL_PARAM param_group_list[][10] = {
+@@ -186,9 +186,9 @@ static const OSSL_PARAM param_group_list[][10] = {
      TLS_GROUP_ENTRY("brainpoolP256r1", "brainpoolP256r1", "EC", 25),
      TLS_GROUP_ENTRY("brainpoolP384r1", "brainpoolP384r1", "EC", 26),
      TLS_GROUP_ENTRY("brainpoolP512r1", "brainpoolP512r1", "EC", 27),
@@ -74,7 +73,7 @@ index f7234615e4..0d4c0e3388 100644
      TLS_GROUP_ENTRY("brainpoolP256r1tls13", "brainpoolP256r1", "EC", 30),
      TLS_GROUP_ENTRY("brainpoolP384r1tls13", "brainpoolP384r1", "EC", 31),
 diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
-index 7ec409710b..ec5bdd5a69 100644
+index 518226dfc6..29438faea8 100644
 --- a/providers/fips/fipsprov.c
 +++ b/providers/fips/fipsprov.c
 @@ -199,13 +199,13 @@ static int fips_get_params(void *provctx, OSSL_PARAM params[])
@@ -132,7 +131,7 @@ index 7ec409710b..ec5bdd5a69 100644
      { NULL, NULL, NULL }
  };
  
-@@ -410,8 +413,9 @@ static const OSSL_ALGORITHM fips_keyexch[] = {
+@@ -409,8 +412,9 @@ static const OSSL_ALGORITHM fips_keyexch[] = {
  #ifndef OPENSSL_NO_EC
      { PROV_NAMES_ECDH, FIPS_DEFAULT_PROPERTIES, ossl_ecdh_keyexch_functions },
  # ifndef OPENSSL_NO_ECX
@@ -144,27 +143,7 @@ index 7ec409710b..ec5bdd5a69 100644
  # endif
  #endif
      { PROV_NAMES_TLS1_PRF, FIPS_DEFAULT_PROPERTIES,
-@@ -422,14 +426,16 @@ static const OSSL_ALGORITHM fips_keyexch[] = {
- 
- static const OSSL_ALGORITHM fips_signature[] = {
- #ifndef OPENSSL_NO_DSA
--    { PROV_NAMES_DSA, FIPS_DEFAULT_PROPERTIES, ossl_dsa_signature_functions },
-+    /* We don't certify DSA in our FIPS provider */
-+    /* { PROV_NAMES_DSA, FIPS_DEFAULT_PROPERTIES, ossl_dsa_signature_functions },*/
- #endif
-     { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_rsa_signature_functions },
- #ifndef OPENSSL_NO_EC
- # ifndef OPENSSL_NO_ECX
--    { PROV_NAMES_ED25519, FIPS_UNAPPROVED_PROPERTIES,
-+    /* We don't certify Edwards curves in our FIPS provider */
-+    /* { PROV_NAMES_ED25519, FIPS_UNAPPROVED_PROPERTIES,
-       ossl_ed25519_signature_functions },
--    { PROV_NAMES_ED448, FIPS_UNAPPROVED_PROPERTIES, ossl_ed448_signature_functions },
-+    { PROV_NAMES_ED448, FIPS_UNAPPROVED_PROPERTIES, ossl_ed448_signature_functions },*/
- # endif
-     { PROV_NAMES_ECDSA, FIPS_DEFAULT_PROPERTIES, ossl_ecdsa_signature_functions },
- #endif
-@@ -460,8 +466,9 @@ static const OSSL_ALGORITHM fips_keymgmt[] = {
+@@ -456,8 +462,9 @@ static const OSSL_ALGORITHM fips_keymgmt[] = {
        PROV_DESCS_DHX },
  #endif
  #ifndef OPENSSL_NO_DSA
@@ -176,7 +155,7 @@ index 7ec409710b..ec5bdd5a69 100644
  #endif
      { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_rsa_keymgmt_functions,
        PROV_DESCS_RSA },
-@@ -471,14 +478,15 @@ static const OSSL_ALGORITHM fips_keymgmt[] = {
+@@ -466,14 +473,15 @@ static const OSSL_ALGORITHM fips_keymgmt[] = {
      { PROV_NAMES_EC, FIPS_DEFAULT_PROPERTIES, ossl_ec_keymgmt_functions,
        PROV_DESCS_EC },
  # ifndef OPENSSL_NO_ECX
@@ -251,10 +230,10 @@ index 2057378d3d..4b80bb70b9 100644
  
  static const ST_KAT_ASYM_CIPHER st_kat_asym_cipher_tests[] = {
 diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c
-index 22d93ead53..c1405f47ea 100644
+index d4261e8f7d..2a5504d104 100644
 --- a/providers/implementations/signature/rsa_sig.c
 +++ b/providers/implementations/signature/rsa_sig.c
-@@ -686,6 +686,19 @@ static int rsa_verify_recover(void *vprsactx,
+@@ -689,6 +689,19 @@ static int rsa_verify_recover(void *vprsactx,
  {
      PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
      int ret;
@@ -274,7 +253,7 @@ index 22d93ead53..c1405f47ea 100644
  
      if (!ossl_prov_is_running())
          return 0;
-@@ -774,6 +787,19 @@ static int rsa_verify(void *vprsactx, const unsigned char *sig, size_t siglen,
+@@ -777,6 +790,19 @@ static int rsa_verify(void *vprsactx, const unsigned char *sig, size_t siglen,
  {
      PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
      size_t rslen;
@@ -295,7 +274,7 @@ index 22d93ead53..c1405f47ea 100644
      if (!ossl_prov_is_running())
          return 0;
 diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
-index 33c23efb0d..113c204716 100644
+index a5e60e8839..f9af07d12b 100644
 --- a/ssl/ssl_ciph.c
 +++ b/ssl/ssl_ciph.c
 @@ -356,6 +356,9 @@ int ssl_load_ciphers(SSL_CTX *ctx)
@@ -309,10 +288,10 @@ index 33c23efb0d..113c204716 100644
       * We ignore any errors from the fetches below. They are expected to fail
       * if these algorithms are not available.
 diff --git a/test/acvp_test.c b/test/acvp_test.c
-index 45509095af..4a67519bb4 100644
+index fee880d441..13d7a0ea8b 100644
 --- a/test/acvp_test.c
 +++ b/test/acvp_test.c
-@@ -1478,6 +1478,7 @@ int setup_tests(void)
+@@ -1476,6 +1476,7 @@ int setup_tests(void)
                    OSSL_NELEM(dh_safe_prime_keyver_data));
  #endif /* OPENSSL_NO_DH */
  
@@ -320,7 +299,7 @@ index 45509095af..4a67519bb4 100644
  #ifndef OPENSSL_NO_DSA
      ADD_ALL_TESTS(dsa_keygen_test, OSSL_NELEM(dsa_keygen_data));
      ADD_ALL_TESTS(dsa_paramgen_test, OSSL_NELEM(dsa_paramgen_data));
-@@ -1485,6 +1486,7 @@ int setup_tests(void)
+@@ -1483,6 +1484,7 @@ int setup_tests(void)
      ADD_ALL_TESTS(dsa_siggen_test, OSSL_NELEM(dsa_siggen_data));
      ADD_ALL_TESTS(dsa_sigver_test, OSSL_NELEM(dsa_sigver_data));
  #endif /* OPENSSL_NO_DSA */
@@ -329,10 +308,10 @@ index 45509095af..4a67519bb4 100644
  #ifndef OPENSSL_NO_EC
      ADD_ALL_TESTS(ecdsa_keygen_test, OSSL_NELEM(ecdsa_keygen_data));
 diff --git a/test/endecode_test.c b/test/endecode_test.c
-index b53b7b715b..885e49a47c 100644
+index 9a437d8c64..53385028fc 100644
 --- a/test/endecode_test.c
 +++ b/test/endecode_test.c
-@@ -1419,6 +1419,7 @@ int setup_tests(void)
+@@ -1407,6 +1407,7 @@ int setup_tests(void)
           * so no legacy tests.
           */
  #endif
@@ -340,7 +319,7 @@ index b53b7b715b..885e49a47c 100644
  #ifndef OPENSSL_NO_DSA
          ADD_TEST_SUITE(DSA);
          ADD_TEST_SUITE_PARAMS(DSA);
-@@ -1429,6 +1430,7 @@ int setup_tests(void)
+@@ -1417,6 +1418,7 @@ int setup_tests(void)
          ADD_TEST_SUITE_PROTECTED_PVK(DSA);
  # endif
  #endif
@@ -348,7 +327,7 @@ index b53b7b715b..885e49a47c 100644
  #ifndef OPENSSL_NO_EC
          ADD_TEST_SUITE(EC);
          ADD_TEST_SUITE_PARAMS(EC);
-@@ -1443,10 +1445,12 @@ int setup_tests(void)
+@@ -1431,10 +1433,12 @@ int setup_tests(void)
          ADD_TEST_SUITE(ECExplicitTri2G);
          ADD_TEST_SUITE_LEGACY(ECExplicitTri2G);
  # endif
@@ -396,7 +375,7 @@ index 2448c35a14..a7913cda4c 100644
      return 1;
  }
 diff --git a/test/recipes/15-test_gendsa.t b/test/recipes/15-test_gendsa.t
-index 4bc460784b..93052eb3e7 100644
+index b495b08bda..69bd299521 100644
 --- a/test/recipes/15-test_gendsa.t
 +++ b/test/recipes/15-test_gendsa.t
 @@ -24,7 +24,7 @@ use lib bldtop_dir('.');
@@ -409,10 +388,10 @@ index 4bc460784b..93052eb3e7 100644
  plan tests =>
      ($no_fips ? 0 : 2)          # FIPS related tests
 diff --git a/test/recipes/20-test_cli_fips.t b/test/recipes/20-test_cli_fips.t
-index d4b4d4ca51..031814e8ff 100644
+index 6d3c5ba1bb..2ba47b5fca 100644
 --- a/test/recipes/20-test_cli_fips.t
 +++ b/test/recipes/20-test_cli_fips.t
-@@ -278,8 +278,7 @@ SKIP: {
+@@ -273,8 +273,7 @@ SKIP: {
  }
  
  SKIP : {
@@ -423,10 +402,10 @@ index d4b4d4ca51..031814e8ff 100644
      subtest DSA => sub {
          my $testtext_prefix = 'DSA';
 diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
-index eddca5c58e..36a192d041 100644
+index 9d7040ced2..f8beb538d4 100644
 --- a/test/recipes/30-test_evp.t
 +++ b/test/recipes/30-test_evp.t
-@@ -46,10 +46,8 @@ my @files = qw(
+@@ -42,10 +42,8 @@ my @files = qw(
                  evpciph_aes_cts.txt
                  evpciph_aes_wrap.txt
                  evpciph_aes_stitched.txt
@@ -437,23 +416,7 @@ index eddca5c58e..36a192d041 100644
                  evpkdf_pbkdf1.txt
                  evpkdf_pbkdf2.txt
                  evpkdf_ss.txt
-@@ -69,15 +67,6 @@ push @files, qw(
-                 evppkey_ffdhe.txt
-                 evppkey_dh.txt
-                ) unless $no_dh;
--push @files, qw(
--                evpkdf_x942_des.txt
--                evpmac_cmac_des.txt
--               ) unless $no_des;
--push @files, qw(evppkey_dsa.txt) unless $no_dsa;
--push @files, qw(
--                evppkey_ecx.txt
--                evppkey_mismatch_ecx.txt
--               ) unless $no_ecx;
- push @files, qw(
-                 evppkey_ecc.txt
-                 evppkey_ecdh.txt
-@@ -97,6 +86,7 @@ my @defltfiles = qw(
+@@ -91,6 +83,7 @@ my @defltfiles = qw(
                       evpciph_cast5.txt
                       evpciph_chacha.txt
                       evpciph_des.txt
@@ -461,7 +424,7 @@ index eddca5c58e..36a192d041 100644
                       evpciph_idea.txt
                       evpciph_rc2.txt
                       evpciph_rc4.txt
-@@ -121,13 +111,19 @@ my @defltfiles = qw(
+@@ -114,10 +107,17 @@ my @defltfiles = qw(
                       evpmd_whirlpool.txt
                       evppbe_scrypt.txt
                       evppbe_pkcs12.txt
@@ -478,15 +441,12 @@ index eddca5c58e..36a192d041 100644
 +               ) unless $no_des;
  push @defltfiles, qw(evppkey_brainpool.txt) unless $no_ec;
  push @defltfiles, qw(evppkey_ecdsa_rfc6979.txt) unless $no_ec;
--push @defltfiles, qw(evppkey_dsa_rfc6979.txt) unless $no_dsa;
- push @defltfiles, qw(evppkey_sm2.txt) unless $no_sm2;
- push @defltfiles, qw(evpciph_aes_gcm_siv.txt) unless $no_siv;
- push @defltfiles, qw(evpciph_aes_siv.txt) unless $no_siv;
+ push @defltfiles, qw(evppkey_dsa_rfc6979.txt) unless $no_dsa;
 diff --git a/test/recipes/30-test_evp_data/evpmac_common.txt b/test/recipes/30-test_evp_data/evpmac_common.txt
-index e47023aae6..96a8febeef 100644
+index 93195df97c..315413cd9b 100644
 --- a/test/recipes/30-test_evp_data/evpmac_common.txt
 +++ b/test/recipes/30-test_evp_data/evpmac_common.txt
-@@ -363,6 +363,7 @@ IV = 7AE8E2CA4EC500012E58495C
+@@ -340,6 +340,7 @@ IV = 7AE8E2CA4EC500012E58495C
  Input = 68F2E77696CE7AE8E2CA4EC588E541002E58495C08000F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D0007
  Result = MAC_INIT_ERROR
  
@@ -494,7 +454,7 @@ index e47023aae6..96a8febeef 100644
  Title = KMAC Tests (From NIST)
  MAC = KMAC128
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
-@@ -373,12 +374,14 @@ Ctrl = xof:0
+@@ -350,12 +351,14 @@ Ctrl = xof:0
  OutputSize = 32
  BlockSize = 168
  
@@ -509,7 +469,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC128
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -386,6 +389,7 @@ Custom = "My Tagged Application"
+@@ -363,6 +366,7 @@ Custom = "My Tagged Application"
  Output = 1F5B4E6CCA02209E0DCB5CA635B89A15E271ECC760071DFD805FAA38F9729230
  Ctrl = size:32
  
@@ -517,7 +477,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 00010203
-@@ -394,12 +398,14 @@ Output = 20C570C31346F703C9AC36C61C03CB64C3970D0CFC787E9B79599D273A68D2F7F69D4CC
+@@ -371,12 +375,14 @@ Output = 20C570C31346F703C9AC36C61C03CB64C3970D0CFC787E9B79599D273A68D2F7F69D4CC
  OutputSize = 64
  BlockSize = 136
  
@@ -532,7 +492,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -409,12 +415,14 @@ Ctrl = size:64
+@@ -386,12 +392,14 @@ Ctrl = size:64
  
  Title = KMAC XOF Tests (From NIST)
  
@@ -547,7 +507,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC128
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 00010203
-@@ -422,6 +430,7 @@ Custom = "My Tagged Application"
+@@ -399,6 +407,7 @@ Custom = "My Tagged Application"
  Output = 31A44527B4ED9F5C6101D11DE6D26F0620AA5C341DEF41299657FE9DF1A3B16C
  XOF = 1
  
@@ -555,7 +515,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC128
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -430,6 +439,7 @@ Output = 47026C7CD793084AA0283C253EF658490C0DB61438B8326FE9BDDF281B83AE0F
+@@ -407,6 +416,7 @@ Output = 47026C7CD793084AA0283C253EF658490C0DB61438B8326FE9BDDF281B83AE0F
  XOF = 1
  Ctrl = size:32
  
@@ -563,7 +523,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 00010203
-@@ -437,6 +447,7 @@ Custom = "My Tagged Application"
+@@ -414,6 +424,7 @@ Custom = "My Tagged Application"
  Output = 1755133F1534752AAD0748F2C706FB5C784512CAB835CD15676B16C0C6647FA96FAA7AF634A0BF8FF6DF39374FA00FAD9A39E322A7C92065A64EB1FB0801EB2B
  XOF = 1
  
@@ -571,7 +531,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -444,6 +455,7 @@ Custom = ""
+@@ -421,6 +432,7 @@ Custom = ""
  Output = FF7B171F1E8A2B24683EED37830EE797538BA8DC563F6DA1E667391A75EDC02CA633079F81CE12A25F45615EC89972031D18337331D24CEB8F8CA8E6A19FD98B
  XOF = 1
  
@@ -579,7 +539,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -454,6 +466,7 @@ XOF = 1
+@@ -431,6 +443,7 @@ XOF = 1
  
  Title = KMAC long customisation string (from NIST ACVP)
  
@@ -587,7 +547,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 9743DBF93102FAF11227B154B8ACD16CF142671F7AA16C559A393A38B4CEF461ED29A6A328D7379C99718790E38B54CA25E9E831CBEA463EE704D1689F94629AB795DF0C77F756DA743309C0E054596BA2D9CC1768ACF7CD351D9A7EB1ABD0A3
  Input = BA63AC9C711F143CCE7FF92D0322649D1BE437D805FD225C0A2879A008373EC3BCCDB09971FAD2BCE5F4347AF7E5238EF01A90ED34193D6AFC1D
-@@ -464,12 +477,14 @@ XOF = 1
+@@ -441,12 +454,14 @@ XOF = 1
  
  Title = KMAC XOF Tests via ctrl (From NIST)
  
@@ -602,7 +562,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC128
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 00010203
-@@ -477,6 +492,7 @@ Custom = "My Tagged Application"
+@@ -454,6 +469,7 @@ Custom = "My Tagged Application"
  Output = 31A44527B4ED9F5C6101D11DE6D26F0620AA5C341DEF41299657FE9DF1A3B16C
  Ctrl = xof:1
  
@@ -610,7 +570,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC128
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -485,6 +501,7 @@ Output = 47026C7CD793084AA0283C253EF658490C0DB61438B8326FE9BDDF281B83AE0F
+@@ -462,6 +478,7 @@ Output = 47026C7CD793084AA0283C253EF658490C0DB61438B8326FE9BDDF281B83AE0F
  Ctrl = xof:1
  Ctrl = size:32
  
@@ -618,7 +578,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 00010203
-@@ -492,6 +509,7 @@ Custom = "My Tagged Application"
+@@ -469,6 +486,7 @@ Custom = "My Tagged Application"
  Output = 1755133F1534752AAD0748F2C706FB5C784512CAB835CD15676B16C0C6647FA96FAA7AF634A0BF8FF6DF39374FA00FAD9A39E322A7C92065A64EB1FB0801EB2B
  Ctrl = xof:1
  
@@ -626,7 +586,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -499,6 +517,7 @@ Custom = ""
+@@ -476,6 +494,7 @@ Custom = ""
  Output = FF7B171F1E8A2B24683EED37830EE797538BA8DC563F6DA1E667391A75EDC02CA633079F81CE12A25F45615EC89972031D18337331D24CEB8F8CA8E6A19FD98B
  Ctrl = xof:1
  
@@ -634,7 +594,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -509,6 +528,7 @@ Ctrl = xof:1
+@@ -486,6 +505,7 @@ Ctrl = xof:1
  
  Title = KMAC long customisation string via ctrl (from NIST ACVP)
  
@@ -642,7 +602,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC256
  Key = 9743DBF93102FAF11227B154B8ACD16CF142671F7AA16C559A393A38B4CEF461ED29A6A328D7379C99718790E38B54CA25E9E831CBEA463EE704D1689F94629AB795DF0C77F756DA743309C0E054596BA2D9CC1768ACF7CD351D9A7EB1ABD0A3
  Input = BA63AC9C711F143CCE7FF92D0322649D1BE437D805FD225C0A2879A008373EC3BCCDB09971FAD2BCE5F4347AF7E5238EF01A90ED34193D6AFC1D
-@@ -519,6 +539,7 @@ Ctrl = xof:1
+@@ -496,6 +516,7 @@ Ctrl = xof:1
  
  Title = KMAC long customisation string negative test
  
@@ -650,7 +610,7 @@ index e47023aae6..96a8febeef 100644
  MAC = KMAC128
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
-@@ -527,6 +548,7 @@ Result = MAC_INIT_ERROR
+@@ -504,6 +525,7 @@ Result = MAC_INIT_ERROR
  
  Title = KMAC output is too large
  
@@ -659,7 +619,7 @@ index e47023aae6..96a8febeef 100644
  Key = 404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F
  Input = 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7
 diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
-index 6a9792128b..4e368c730b 100644
+index 40dd585c18..cbec426137 100644
 --- a/test/recipes/80-test_cms.t
 +++ b/test/recipes/80-test_cms.t
 @@ -96,7 +96,7 @@ my @smime_pkcs7_tests = (
@@ -734,7 +694,7 @@ index 6a9792128b..4e368c730b 100644
        [ "{cmd1}", @prov, "-sign", "-in", $smcont,
          "-signer", $smrsa1,
          "-signer", catfile($smdir, "smrsa2.pem"),
-@@ -250,7 +250,7 @@ my @smime_pkcs7_tests = (
+@@ -248,7 +248,7 @@ my @smime_pkcs7_tests = (
  
  my @smime_cms_tests = (
  
@@ -743,7 +703,7 @@ index 6a9792128b..4e368c730b 100644
        [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
          "-nodetach", "-keyid",
          "-signer", $smrsa1,
-@@ -263,7 +263,7 @@ my @smime_cms_tests = (
+@@ -261,7 +261,7 @@ my @smime_cms_tests = (
        \&final_compare
      ],
  
@@ -752,7 +712,7 @@ index 6a9792128b..4e368c730b 100644
        [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
          "-signer", $smrsa1,
          "-signer", catfile($smdir, "smrsa2.pem"),
-@@ -373,7 +373,7 @@ my @smime_cms_tests = (
+@@ -371,7 +371,7 @@ my @smime_cms_tests = (
        \&final_compare
      ],
  
@@ -775,5 +735,58 @@ index 50b74a1e29..e2dcb68fb5 100644
          }
  
 -- 
-2.44.0
+2.41.0
 
+diff -up openssl-3.2.0/test/recipes/30-test_evp.t.patch openssl-3.2.0/test/recipes/30-test_evp.t
+--- openssl-3.2.0/test/recipes/30-test_evp.t.patch	2023-12-06 15:33:27.843751147 +0100
++++ openssl-3.2.0/test/recipes/30-test_evp.t	2023-12-06 15:34:27.585351920 +0100
+@@ -70,15 +70,6 @@ push @files, qw(
+                 evppkey_dh.txt
+                ) unless $no_dh;
+ push @files, qw(
+-                evpkdf_x942_des.txt
+-                evpmac_cmac_des.txt
+-               ) unless $no_des;
+-push @files, qw(evppkey_dsa.txt) unless $no_dsa;
+-push @files, qw(
+-                evppkey_ecx.txt
+-                evppkey_mismatch_ecx.txt
+-               ) unless $no_ecx;
+-push @files, qw(
+                 evppkey_ecc.txt
+                 evppkey_ecdh.txt
+                 evppkey_ecdsa.txt
+diff -up openssl-3.2.0/providers/fips/fipsprov.c.patch-fips openssl-3.2.0/providers/fips/fipsprov.c
+--- openssl-3.2.0/providers/fips/fipsprov.c.patch-fips	2023-12-06 15:49:08.711198219 +0100
++++ openssl-3.2.0/providers/fips/fipsprov.c	2023-12-06 15:55:42.362078721 +0100
+@@ -426,14 +426,16 @@ static const OSSL_ALGORITHM fips_keyexch
+ 
+ static const OSSL_ALGORITHM fips_signature[] = {
+ #ifndef OPENSSL_NO_DSA
+-    { PROV_NAMES_DSA, FIPS_DEFAULT_PROPERTIES, ossl_dsa_signature_functions },
++    /* We don't certify DSA in our FIPS provider */
++    /* { PROV_NAMES_DSA, FIPS_DEFAULT_PROPERTIES, ossl_dsa_signature_functions },*/
+ #endif
+     { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_rsa_signature_functions },
+ #ifndef OPENSSL_NO_EC
+ # ifndef OPENSSL_NO_ECX
+-    { PROV_NAMES_ED25519, FIPS_UNAPPROVED_PROPERTIES,
++    /* We don't certify Edwards curves in our FIPS provider */
++    /* { PROV_NAMES_ED25519, FIPS_UNAPPROVED_PROPERTIES,
+       ossl_ed25519_signature_functions },
+-    { PROV_NAMES_ED448, FIPS_UNAPPROVED_PROPERTIES, ossl_ed448_signature_functions },
++    { PROV_NAMES_ED448, FIPS_UNAPPROVED_PROPERTIES, ossl_ed448_signature_functions },*/
+ # endif
+     { PROV_NAMES_ECDSA, FIPS_DEFAULT_PROPERTIES, ossl_ecdsa_signature_functions },
+ #endif
+diff -up openssl-3.2.0/test/recipes/30-test_evp.t.fips-min openssl-3.2.0/test/recipes/30-test_evp.t
+--- openssl-3.2.0/test/recipes/30-test_evp.t.fips-min	2024-02-01 11:00:56.823687618 +0100
++++ openssl-3.2.0/test/recipes/30-test_evp.t	2024-02-01 11:01:20.131934678 +0100
+@@ -124,7 +124,6 @@ push @defltfiles, qw(
+                ) unless $no_des;
+ push @defltfiles, qw(evppkey_brainpool.txt) unless $no_ec;
+ push @defltfiles, qw(evppkey_ecdsa_rfc6979.txt) unless $no_ec;
+-push @defltfiles, qw(evppkey_dsa_rfc6979.txt) unless $no_dsa;
+ push @defltfiles, qw(evppkey_sm2.txt) unless $no_sm2;
+ push @defltfiles, qw(evpciph_aes_gcm_siv.txt) unless $no_siv;
+ push @defltfiles, qw(evpciph_aes_siv.txt) unless $no_siv;

SOURCES/0049-Allow-disabling-of-SHA1-signatures.patch

@@ -1,13 +1,13 @@
-From 4f9167db05cade673f98f1a00efd57136e97b460 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 6 Mar 2024 19:17:15 +0100
-Subject: [PATCH 22/49] 0049-Allow-disabling-of-SHA1-signatures.patch
+From 2e8388e06eafb703aeb315498915bf079561bdb5 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 13:07:07 +0200
+Subject: [PATCH 23/48] 0049-Allow-disabling-of-SHA1-signatures.patch
 
 Patch-name: 0049-Allow-disabling-of-SHA1-signatures.patch
 Patch-id: 49
 Patch-status: |
-    # # Selectively disallow SHA1 signatures rhbz#2070977
-From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
+    # Selectively disallow SHA1 signatures rhbz#2070977
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
 ---
  crypto/context.c                              | 14 ++++
  crypto/evp/evp_cnf.c                          | 13 +++
@@ -27,10 +27,10 @@ From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
  15 files changed, 209 insertions(+), 9 deletions(-)
 
 diff --git a/crypto/context.c b/crypto/context.c
-index fb4816d89b..c04920fe14 100644
+index 51002ba79a..e697974c9d 100644
 --- a/crypto/context.c
 +++ b/crypto/context.c
-@@ -83,6 +83,8 @@ struct ossl_lib_ctx_st {
+@@ -78,6 +78,8 @@ struct ossl_lib_ctx_st {
      void *fips_prov;
  #endif
  
@@ -39,7 +39,7 @@ index fb4816d89b..c04920fe14 100644
      unsigned int ischild:1;
  };
  
-@@ -223,6 +225,10 @@ static int context_init(OSSL_LIB_CTX *ctx)
+@@ -206,6 +208,10 @@ static int context_init(OSSL_LIB_CTX *ctx)
          goto err;
  #endif
  
@@ -50,7 +50,7 @@ index fb4816d89b..c04920fe14 100644
      /* Low priority. */
  #ifndef FIPS_MODULE
      ctx->child_provider = ossl_child_prov_ctx_new(ctx);
-@@ -366,6 +372,11 @@ static void context_deinit_objs(OSSL_LIB_CTX *ctx)
+@@ -334,6 +340,11 @@ static void context_deinit_objs(OSSL_LIB_CTX *ctx)
      }
  #endif
  
@@ -62,7 +62,7 @@ index fb4816d89b..c04920fe14 100644
      /* Low priority. */
  #ifndef FIPS_MODULE
      if (ctx->child_provider != NULL) {
-@@ -663,6 +674,9 @@ void *ossl_lib_ctx_get_data(OSSL_LIB_CTX *ctx, int index)
+@@ -625,6 +636,9 @@ void *ossl_lib_ctx_get_data(OSSL_LIB_CTX *ctx, int index)
          return ctx->fips_prov;
  #endif
  
@@ -104,7 +104,7 @@ index 0e7fe64cf9..b9d3b6d226 100644
              ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_OPTION,
                             "name=%s, value=%s", oval->name, oval->value);
 diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
-index 3a979f4bd4..fd3a4b79df 100644
+index 630d339c35..6e4e9f5ae7 100644
 --- a/crypto/evp/m_sigver.c
 +++ b/crypto/evp/m_sigver.c
 @@ -15,6 +15,73 @@
@@ -181,7 +181,7 @@ index 3a979f4bd4..fd3a4b79df 100644
  
  #ifndef FIPS_MODULE
  
-@@ -253,6 +320,18 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -251,6 +318,18 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
          }
      }
  
@@ -201,7 +201,7 @@ index 3a979f4bd4..fd3a4b79df 100644
          if (signature->digest_verify_init == NULL) {
              ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
 diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
-index 268b1617e3..248f655d0f 100644
+index ce6e1a1ccb..003926247b 100644
 --- a/crypto/evp/pmeth_lib.c
 +++ b/crypto/evp/pmeth_lib.c
 @@ -33,6 +33,7 @@
@@ -212,7 +212,7 @@ index 268b1617e3..248f655d0f 100644
  #include "evp_local.h"
  
  #ifndef FIPS_MODULE
-@@ -951,6 +952,20 @@ static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
+@@ -958,6 +959,20 @@ static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
          return -2;
      }
  
@@ -237,29 +237,31 @@ diff --git a/doc/man5/config.pod b/doc/man5/config.pod
 index bd05736220..ed34ff4b9c 100644
 --- a/doc/man5/config.pod
 +++ b/doc/man5/config.pod
-@@ -304,6 +304,17 @@ Within the algorithm properties section, the following names have meaning:
+@@ -304,6 +304,19 @@ Within the algorithm properties section, the following names have meaning:
  The value may be anything that is acceptable as a property query
  string for EVP_set_default_properties().
  
 +=item B<rh-allow-sha1-signatures>
 +
 +The value is a boolean that can be B<yes> or B<no>.  If the value is not set,
-+it behaves as if it was set to B<no>.
++it behaves as if it was set to B<yes>.
 +
 +When set to B<no>, any attempt to create or verify a signature with a SHA1
-+digest will fail.  For compatibility with older versions of OpenSSL, set this
-+option to B<yes>.  This setting also affects TLS, where signature algorithms
-+that use SHA1 as digest will no longer be supported if this option is set to
-+B<no>.
++digest will fail.  To test whether your software will work with future versions
++of OpenSSL, set this option to B<no>.  This setting also affects TLS, where
++signature algorithms that use SHA1 as digest will no longer be supported if
++this option is set to B<no>.  Because TLS 1.1 or lower use MD5-SHA1 as
++pseudorandom function (PRF) to derive key material, disabling
++B<rh-allow-sha1-signatures> requires the use of TLS 1.2 or newer.
 +
  =item B<fips_mode> (deprecated)
  
  The value is a boolean that can be B<yes> or B<no>.  If the value is
 diff --git a/include/crypto/context.h b/include/crypto/context.h
-index 7369a730fb..55b74238c8 100644
+index cc06c71be8..e9f74a414d 100644
 --- a/include/crypto/context.h
 +++ b/include/crypto/context.h
-@@ -46,3 +46,6 @@ void ossl_release_default_drbg_ctx(void);
+@@ -39,3 +39,6 @@ void ossl_rand_crng_ctx_free(void *);
  #if defined(OPENSSL_THREADS)
  void ossl_threads_ctx_free(void *);
  #endif
@@ -267,10 +269,10 @@ index 7369a730fb..55b74238c8 100644
 +void *ossl_ctx_legacy_digest_signatures_new(OSSL_LIB_CTX *);
 +void ossl_ctx_legacy_digest_signatures_free(void *);
 diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
-index 64851fd8ed..8e01a77ddc 100644
+index ac50eb3bbd..3b115cc7df 100644
 --- a/include/internal/cryptlib.h
 +++ b/include/internal/cryptlib.h
-@@ -117,7 +117,8 @@ typedef struct ossl_ex_data_global_st {
+@@ -168,7 +168,8 @@ typedef struct ossl_ex_data_global_st {
  # define OSSL_LIB_CTX_CHILD_PROVIDER_INDEX          18
  # define OSSL_LIB_CTX_THREAD_INDEX                  19
  # define OSSL_LIB_CTX_DECODER_CACHE_INDEX           20
@@ -294,7 +296,7 @@ index fd7f7e3331..05464b0655 100644
 +                                                  int loadconfig);
  #endif
 diff --git a/providers/common/securitycheck.c b/providers/common/securitycheck.c
-index 0d3acdbe56..fe694c4e96 100644
+index 699ada7c52..e534ad0a5f 100644
 --- a/providers/common/securitycheck.c
 +++ b/providers/common/securitycheck.c
 @@ -19,6 +19,7 @@
@@ -305,7 +307,7 @@ index 0d3acdbe56..fe694c4e96 100644
  
  /*
   * FIPS requires a minimum security strength of 112 bits (for encryption or
-@@ -243,6 +244,15 @@ int ossl_digest_get_approved_nid_with_sha1(OSSL_LIB_CTX *ctx, const EVP_MD *md,
+@@ -235,6 +236,15 @@ int ossl_digest_get_approved_nid_with_sha1(OSSL_LIB_CTX *ctx, const EVP_MD *md,
              mdnid = -1; /* disallowed by security checks */
      }
  # endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
@@ -359,10 +361,10 @@ index 246323493e..2ca7a59f39 100644
      return mdnid;
  }
 diff --git a/providers/implementations/signature/dsa_sig.c b/providers/implementations/signature/dsa_sig.c
-index b89a0f6836..e0c26a13e4 100644
+index 70d0ea5d24..3c482e0181 100644
 --- a/providers/implementations/signature/dsa_sig.c
 +++ b/providers/implementations/signature/dsa_sig.c
-@@ -125,12 +125,17 @@ static int dsa_setup_md(PROV_DSA_CTX *ctx,
+@@ -123,12 +123,17 @@ static int dsa_setup_md(PROV_DSA_CTX *ctx,
          mdprops = ctx->propq;
  
      if (mdname != NULL) {
@@ -384,10 +386,10 @@ index b89a0f6836..e0c26a13e4 100644
          if (md == NULL || md_nid < 0) {
              if (md == NULL)
 diff --git a/providers/implementations/signature/ecdsa_sig.c b/providers/implementations/signature/ecdsa_sig.c
-index f158105e71..62355b89fe 100644
+index ebeb30e002..c874f87bd5 100644
 --- a/providers/implementations/signature/ecdsa_sig.c
 +++ b/providers/implementations/signature/ecdsa_sig.c
-@@ -247,7 +247,11 @@ static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx, const char *mdname,
+@@ -237,7 +237,11 @@ static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx, const char *mdname,
                         "%s could not be fetched", mdname);
          return 0;
      }
@@ -400,7 +402,7 @@ index f158105e71..62355b89fe 100644
                                                      sha1_allowed);
      if (md_nid < 0) {
 diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c
-index c1405f47ea..aeda1a7758 100644
+index 2a5504d104..5f3a029566 100644
 --- a/providers/implementations/signature/rsa_sig.c
 +++ b/providers/implementations/signature/rsa_sig.c
 @@ -25,6 +25,7 @@
@@ -419,7 +421,7 @@ index c1405f47ea..aeda1a7758 100644
  
  OSSL_FUNC_signature_newctx_fn rsa_newctx;
  static OSSL_FUNC_signature_sign_init_fn rsa_sign_init;
-@@ -301,10 +303,15 @@ static int rsa_setup_md(PROV_RSA_CTX *ctx, const char *mdname,
+@@ -302,10 +304,15 @@ static int rsa_setup_md(PROV_RSA_CTX *ctx, const char *mdname,
  
      if (mdname != NULL) {
          EVP_MD *md = EVP_MD_fetch(ctx->libctx, mdname, mdprops);
@@ -437,7 +439,7 @@ index c1405f47ea..aeda1a7758 100644
  
          if (md == NULL
              || md_nid <= 0
-@@ -1392,8 +1399,15 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
+@@ -1396,8 +1403,15 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
      prsactx->pad_mode = pad_mode;
  
      if (prsactx->md == NULL && pmdname == NULL
@@ -454,10 +456,22 @@ index c1405f47ea..aeda1a7758 100644
  
      if (pmgf1mdname != NULL
          && !rsa_setup_mgf1_md(prsactx, pmgf1mdname, pmgf1mdprops))
-diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
-index 631e1fdef9..05dd7c5595 100644
---- a/ssl/t1_lib.c
-+++ b/ssl/t1_lib.c
+diff --git a/util/libcrypto.num b/util/libcrypto.num
+index 9cb8a4dda2..feb660d030 100644
+--- a/util/libcrypto.num
++++ b/util/libcrypto.num
+@@ -5436,3 +5436,5 @@ EVP_CIPHER_CTX_dup                      5563	3_1_0	EXIST::FUNCTION:
+ X509_STORE_CTX_set_current_reasons      5664	3_2_0	EXIST::FUNCTION:
+ OSSL_STORE_delete                       5665	3_2_0	EXIST::FUNCTION:
+ BIO_ADDR_copy                           5666	3_2_0	EXIST::FUNCTION:SOCK
++ossl_ctx_legacy_digest_signatures_allowed ?	3_0_1	EXIST::FUNCTION:
++ossl_ctx_legacy_digest_signatures_allowed_set ?	3_0_1	EXIST::FUNCTION:
+-- 
+2.41.0
+
+diff -up openssl-3.2.0/ssl/t1_lib.c.patch-sha1 openssl-3.2.0/ssl/t1_lib.c
+--- openssl-3.2.0/ssl/t1_lib.c.patch-sha1	2023-12-08 13:01:44.752501257 +0100
++++ openssl-3.2.0/ssl/t1_lib.c	2023-12-08 13:04:18.969899853 +0100
 @@ -20,6 +20,7 @@
  #include <openssl/bn.h>
  #include <openssl/provider.h>
@@ -494,16 +508,3 @@ index 631e1fdef9..05dd7c5595 100644
  
          if (!EVP_PKEY_set_type(tmpkey, lu->sig)) {
              cache[i].enabled = 0;
-diff --git a/util/libcrypto.num b/util/libcrypto.num
-index ef97803327..8046454025 100644
---- a/util/libcrypto.num
-+++ b/util/libcrypto.num
-@@ -5536,3 +5536,5 @@ X509_STORE_CTX_set_get_crl              5663	3_2_0	EXIST::FUNCTION:
- X509_STORE_CTX_set_current_reasons      5664	3_2_0	EXIST::FUNCTION:
- OSSL_STORE_delete                       5665	3_2_0	EXIST::FUNCTION:
- BIO_ADDR_copy                           5666	3_2_0	EXIST::FUNCTION:SOCK
-+ossl_ctx_legacy_digest_signatures_allowed ?	3_0_1	EXIST::FUNCTION:
-+ossl_ctx_legacy_digest_signatures_allowed_set ?	3_0_1	EXIST::FUNCTION:
--- 
-2.44.0
-

SOURCES/0050-FIPS-enable-pkcs12-mac.patch

@@ -1,95 +0,0 @@
-diff -up openssl-3.0.1/crypto/pkcs12/p12_key.c.pkc12_fips openssl-3.0.1/crypto/pkcs12/p12_key.c
---- openssl-3.0.1/crypto/pkcs12/p12_key.c.pkc12_fips	2022-02-21 12:35:24.829893907 +0100
-+++ openssl-3.0.1/crypto/pkcs12/p12_key.c	2022-02-21 13:01:22.711622967 +0100
-@@ -85,17 +85,41 @@ int PKCS12_key_gen_uni_ex(unsigned char
-     EVP_KDF *kdf;
-     EVP_KDF_CTX *ctx;
-     OSSL_PARAM params[6], *p = params;
-+    char *adjusted_propq = NULL;
- 
-     if (n <= 0)
-         return 0;
- 
--    kdf = EVP_KDF_fetch(libctx, "PKCS12KDF", propq);
--    if (kdf == NULL)
-+    if (ossl_get_kernel_fips_flag()) {
-+        const char *nofips = "-fips";
-+        size_t len = propq ? strlen(propq) + 1 + strlen(nofips) + 1 :
-+                                                 strlen(nofips) + 1;
-+        char *ptr = NULL;
-+
-+        adjusted_propq = OPENSSL_zalloc(len);
-+        if (adjusted_propq != NULL) {
-+            ptr = adjusted_propq;
-+            if (propq) {
-+                memcpy(ptr, propq, strlen(propq));
-+                ptr += strlen(propq);
-+                *ptr = ',';
-+                ptr++;
-+            }
-+            memcpy(ptr, nofips, strlen(nofips));
-+        }
-+    }
-+
-+    kdf = adjusted_propq ? EVP_KDF_fetch(libctx, "PKCS12KDF", adjusted_propq) : EVP_KDF_fetch(libctx, "PKCS12KDF", propq);
-+    if (kdf == NULL) {
-+        OPENSSL_free(adjusted_propq);
-         return 0;
-+    }
-     ctx = EVP_KDF_CTX_new(kdf);
-     EVP_KDF_free(kdf);
--    if (ctx == NULL)
-+    if (ctx == NULL) {
-+        OPENSSL_free(adjusted_propq);
-         return 0;
-+    }
- 
-     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                             (char *)EVP_MD_get0_name(md_type),
-@@ -127,6 +149,7 @@ int PKCS12_key_gen_uni_ex(unsigned char
-         } OSSL_TRACE_END(PKCS12_KEYGEN);
-     }
-     EVP_KDF_CTX_free(ctx);
-+    OPENSSL_free(adjusted_propq);
-     return res;
- }
- 
-diff -up openssl-3.0.1/apps/pkcs12.c.pkc12_fips_apps openssl-3.0.1/apps/pkcs12.c
---- openssl-3.0.1/apps/pkcs12.c.pkc12_fips_apps	2022-02-21 16:37:07.908923682 +0100
-+++ openssl-3.0.1/apps/pkcs12.c	2022-02-21 17:38:44.555345633 +0100
-@@ -765,15 +765,34 @@ int pkcs12_main(int argc, char **argv)
-     }
-     if (macver) {
-         EVP_KDF *pkcs12kdf;
-+        char *adjusted_propq = NULL;
-+        const char *nofips = "-fips";
-+        size_t len = app_get0_propq() ? strlen(app_get0_propq()) + 1 + strlen(nofips) + 1 :
-+                                                            strlen(nofips) + 1;
-+        char *ptr = NULL;
-+
-+        adjusted_propq = OPENSSL_zalloc(len);
-+        if (adjusted_propq != NULL) {
-+                ptr = adjusted_propq;
-+                if (app_get0_propq()) {
-+                    memcpy(ptr, app_get0_propq(), strlen(app_get0_propq()));
-+                    ptr += strlen(app_get0_propq());
-+                    *ptr = ',';
-+                    ptr++;
-+                }
-+                memcpy(ptr, nofips, strlen(nofips));
-+        }
- 
-         pkcs12kdf = EVP_KDF_fetch(app_get0_libctx(), "PKCS12KDF",
--                                  app_get0_propq());
-+                                  adjusted_propq ? adjusted_propq : app_get0_propq());
-         if (pkcs12kdf == NULL) {
-             BIO_printf(bio_err, "Error verifying PKCS12 MAC; no PKCS12KDF support.\n");
-             BIO_printf(bio_err, "Use -nomacver if MAC verification is not required.\n");
-+            OPENSSL_free(adjusted_propq);
-             goto end;
-         }
-         EVP_KDF_free(pkcs12kdf);
-+        OPENSSL_free(adjusted_propq);
-         /* If we enter empty password try no password first */
-         if (!mpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {
-             /* If mac and crypto pass the same set it to NULL too */

SOURCES/0052-Allow-SHA1-in-seclevel-2-if-rh-allow-sha1-signatures.patch

@@ -1,205 +0,0 @@
-From c63599ee9708d543205a9173207ee7167315c624 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Tue, 1 Mar 2022 15:44:18 +0100
-Subject: [PATCH] Allow SHA1 in seclevel 2 if rh-allow-sha1-signatures = yes
-
-References: rhbz#2055796
----
- crypto/x509/x509_vfy.c        | 19 ++++++++++-
- doc/man5/config.pod           |  7 +++-
- ssl/t1_lib.c                  | 64 ++++++++++++++++++++++++++++-------
- test/recipes/25-test_verify.t |  7 ++--
- 4 files changed, 79 insertions(+), 18 deletions(-)
-
-diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
-index ff3ca83de6..a549c1c111 100644
---- a/crypto/x509/x509_vfy.c
-+++ b/crypto/x509/x509_vfy.c
-@@ -25,6 +25,7 @@
- #include <openssl/objects.h>
- #include <openssl/core_names.h>
- #include "internal/dane.h"
-+#include "internal/sslconf.h"
- #include "crypto/x509.h"
- #include "x509_local.h"
- 
-@@ -3440,14 +3441,30 @@ static int check_sig_level(X509_STORE_CTX *ctx, X509 *cert)
- {
-     int secbits = -1;
-     int level = ctx->param->auth_level;
-+    int nid;
-+    OSSL_LIB_CTX *libctx = NULL;
- 
-     if (level <= 0)
-         return 1;
-     if (level > NUM_AUTH_LEVELS)
-         level = NUM_AUTH_LEVELS;
- 
--    if (!X509_get_signature_info(cert, NULL, NULL, &secbits, NULL))
-+    if (ctx->libctx)
-+        libctx = ctx->libctx;
-+    else if (cert->libctx)
-+        libctx = cert->libctx;
-+    else
-+        libctx = OSSL_LIB_CTX_get0_global_default();
-+
-+    if (!X509_get_signature_info(cert, &nid, NULL, &secbits, NULL))
-         return 0;
- 
-+    if (nid == NID_sha1
-+            && ossl_ctx_legacy_digest_signatures_allowed(libctx, 0)
-+            && ctx->param->auth_level < 3)
-+        /* When rh-allow-sha1-signatures = yes and security level <= 2,
-+         * explicitly allow SHA1 for backwards compatibility. */
-+        return 1;
-+
-     return secbits >= minbits_table[level - 1];
- }
-diff --git a/doc/man5/config.pod b/doc/man5/config.pod
-index aa1be5ca7f..aa69e2b844 100644
---- a/doc/man5/config.pod
-+++ b/doc/man5/config.pod
-@@ -305,7 +305,12 @@ When set to B<no>, any attempt to create or verify a signature with a SHA1
- digest will fail.  For compatibility with older versions of OpenSSL, set this
- option to B<yes>.  This setting also affects TLS, where signature algorithms
- that use SHA1 as digest will no longer be supported if this option is set to
--B<no>.
-+B<no>.  Note that enabling B<rh-allow-sha1-signatures> will allow TLS signature
-+algorithms that use SHA1 in security level 2, despite the definition of
-+security level 2 of 112 bits of security, which SHA1 does not meet.  Because
-+TLS 1.1 or lower use MD5-SHA1 as pseudorandom function (PRF) to derive key
-+material, disabling B<rh-allow-sha1-signatures> requires the use of TLS 1.2 or
-+newer.
- 
- =item B<fips_mode> (deprecated)
- 
-diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
-index 4b74ee1a34..5f089de107 100644
---- a/ssl/t1_lib.c
-+++ b/ssl/t1_lib.c
-@@ -20,6 +20,7 @@
- #include <openssl/bn.h>
- #include <openssl/provider.h>
- #include <openssl/param_build.h>
-+#include "crypto/x509.h"
- #include "internal/sslconf.h"
- #include "internal/nelem.h"
- #include "internal/sizes.h"
-@@ -1561,19 +1562,27 @@ int tls12_check_peer_sigalg(SSL *s, uint16_t sig, EVP_PKEY *pkey)
-         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_UNKNOWN_DIGEST);
-         return 0;
-     }
--    /*
--     * Make sure security callback allows algorithm. For historical
--     * reasons we have to pass the sigalg as a two byte char array.
--     */
--    sigalgstr[0] = (sig >> 8) & 0xff;
--    sigalgstr[1] = sig & 0xff;
--    secbits = sigalg_security_bits(SSL_CONNECTION_GET_CTX(s), lu);
--    if (secbits == 0 ||
--        !ssl_security(s, SSL_SECOP_SIGALG_CHECK, secbits,
--                      md != NULL ? EVP_MD_get_type(md) : NID_undef,
--                      (void *)sigalgstr)) {
--        SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_WRONG_SIGNATURE_TYPE);
--        return 0;
-+
-+    if (lu->hash == NID_sha1
-+            && ossl_ctx_legacy_digest_signatures_allowed(s->session_ctx->libctx, 0)
-+            && SSL_get_security_level(SSL_CONNECTION_GET_SSL(s)) < 3) {
-+        /* when rh-allow-sha1-signatures = yes and security level <= 2,
-+         * explicitly allow SHA1 for backwards compatibility */
-+    } else {
-+        /*
-+         * Make sure security callback allows algorithm. For historical
-+         * reasons we have to pass the sigalg as a two byte char array.
-+         */
-+        sigalgstr[0] = (sig >> 8) & 0xff;
-+        sigalgstr[1] = sig & 0xff;
-+        secbits = sigalg_security_bits(s->session_ctx, lu);
-+        if (secbits == 0 ||
-+            !ssl_security(s, SSL_SECOP_SIGALG_CHECK, secbits,
-+                          md != NULL ? EVP_MD_get_type(md) : NID_undef,
-+                          (void *)sigalgstr)) {
-+            SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_WRONG_SIGNATURE_TYPE);
-+            return 0;
-+        }
-     }
-     /* Store the sigalg the peer uses */
-     s->s3.tmp.peer_sigalg = lu;
-@@ -2106,6 +2115,14 @@ static int tls12_sigalg_allowed(const SSL *s, int op, const SIGALG_LOOKUP *lu)
-         }
-     }
- 
-+    if (lu->hash == NID_sha1
-+            && ossl_ctx_legacy_digest_signatures_allowed(s->session_ctx->libctx, 0)
-+            && SSL_get_security_level(SSL_CONNECTION_GET_SSL(s)) < 3) {
-+        /* when rh-allow-sha1-signatures = yes and security level <= 2,
-+         * explicitly allow SHA1 for backwards compatibility */
-+        return 1;
-+    }
-+
-     /* Finally see if security callback allows it */
-     secbits = sigalg_security_bits(SSL_CONNECTION_GET_CTX(s), lu);
-     sigalgstr[0] = (lu->sigalg >> 8) & 0xff;
-@@ -2977,6 +2994,8 @@ static int ssl_security_cert_sig(SSL *s, SSL_CTX *ctx, X509 *x, int op)
- {
-     /* Lookup signature algorithm digest */
-     int secbits, nid, pknid;
-+    OSSL_LIB_CTX *libctx = NULL;
-+
- 
-     /* Don't check signature if self signed */
-     if ((X509_get_extension_flags(x) & EXFLAG_SS) != 0)
-@@ -2985,6 +3004,25 @@ static int ssl_security_cert_sig(SSL *s, SSL_CTX *ctx, X509 *x, int op)
-     /* If digest NID not defined use signature NID */
-     if (nid == NID_undef)
-         nid = pknid;
-+
-+    if (x && x->libctx)
-+        libctx = x->libctx;
-+    else if (ctx && ctx->libctx)
-+        libctx = ctx->libctx;
-+    else if (s && s->session_ctx && s->session_ctx->libctx)
-+        libctx = s->session_ctx->libctx;
-+    else
-+        libctx = OSSL_LIB_CTX_get0_global_default();
-+
-+    if (nid == NID_sha1
-+            && ossl_ctx_legacy_digest_signatures_allowed(libctx, 0)
-+            && ((s != NULL && SSL_get_security_level(SSL_CONNECTION_GET_SSL(s)) < 3)
-+                || (ctx != NULL && SSL_CTX_get_security_level(ctx) < 3)
-+            ))
-+        /* When rh-allow-sha1-signatures = yes and security level <= 2,
-+         * explicitly allow SHA1 for backwards compatibility. */
-+        return 1;
-+
-     if (s != NULL)
-         return ssl_security(s, op, secbits, nid, x);
-     else
-diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
-index 700bbd849c..2de1d76b5e 100644
---- a/test/recipes/25-test_verify.t
-+++ b/test/recipes/25-test_verify.t
-@@ -29,7 +29,7 @@ sub verify {
-     run(app([@args]));
- }
- 
--plan tests => 193;
-+plan tests => 192;
- 
- # Canonical success
- ok(verify("ee-cert", "sslserver", ["root-cert"], ["ca-cert"]),
-@@ -387,8 +387,9 @@ ok(verify("ee-pss-sha1-cert", "", ["root-cert"], ["ca-cert"], "-auth_level", "0"
- ok(verify("ee-pss-sha256-cert", "", ["root-cert"], ["ca-cert"], ),
-     "CA with PSS signature using SHA256");
- 
--ok(!verify("ee-pss-sha1-cert", "", ["root-cert"], ["ca-cert"], "-auth_level", "1"),
--    "Reject PSS signature using SHA1 and auth level 1");
-+## rh-allow-sha1-signatures=yes allows this to pass despite -auth_level 1
-+#ok(!verify("ee-pss-sha1-cert", "", ["root-cert"], ["ca-cert"], "-auth_level", "1"),
-+#    "Reject PSS signature using SHA1 and auth level 1");
- 
- ok(verify("ee-pss-sha256-cert", "", ["root-cert"], ["ca-cert"], "-auth_level", "2"),
-     "PSS signature using SHA256 and auth level 2");
--- 
-2.35.1

SOURCES/0073-FIPS-Use-OAEP-in-KATs-support-fixed-OAEP-seed.patch

@@ -1,39 +1,22 @@
-From 4a2239bd7d444c30c55b20ea8b4aeadafdfe1afd Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Fri, 22 Jul 2022 13:59:37 +0200
-Subject: [PATCH] FIPS: Use OAEP in KATs, support fixed OAEP seed
+From abeda0b0475adb0d4f89b0c97cfc349779915bbf Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 31 Jul 2023 09:41:28 +0200
+Subject: [PATCH 29/35] 
+ 0073-FIPS-Use-OAEP-in-KATs-support-fixed-OAEP-seed.patch
 
-Review by our lab for FIPS 140-3 certification expects the RSA
-encryption and decryption tests to use a supported padding mode, not raw
-RSA signatures. Switch to RSA-OAEP for the self tests to fulfill that.
-
-The FIPS 140-3 Implementation Guidance specifies in section 10.3.A
-"Cryptographic Algorithm Self-Test Requirements" that a self-test may be
-a known-answer test, a comparison test, or a fault-detection test.
-
-Comparison tests are not an option, because they would require
-a separate implementation of RSA-OAEP, which we do not have. Fault
-detection tests require implementing fault detection mechanisms into the
-cryptographic algorithm implementation, we we also do not have.
-
-As a consequence, a known-answer test must be used to test RSA
-encryption and decryption, but RSA encryption with OAEP padding is not
-deterministic, and thus encryption will always yield different results
-that could not be compared to known answers. For this reason, this
-change explicitly sets the seed in OAEP (see RFC 8017 section 7.1.1),
-which is the source of randomness for RSA-OAEP, to a fixed value. This
-setting is only available during self-test execution, and the parameter
-set using EVP_PKEY_CTX_set_params() will be ignored otherwise.
-
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0073-FIPS-Use-OAEP-in-KATs-support-fixed-OAEP-seed.patch
+Patch-id: 73
+Patch-status: |
+    # https://bugzilla.redhat.com/show_bug.cgi?id=2102535
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
 ---
  crypto/rsa/rsa_local.h                        |  8 ++
  crypto/rsa/rsa_oaep.c                         | 34 ++++++--
- providers/fips/self_test_data.inc             | 83 +++++++++++--------
+ include/openssl/core_names.h                  |  3 +
+ providers/fips/self_test_data.inc             | 79 ++++++++++---------
  providers/fips/self_test_kats.c               |  7 ++
  .../implementations/asymciphers/rsa_enc.c     | 41 +++++++++-
- util/perl/OpenSSL/paramnames.pm               |  1 +
- 6 files changed, 126 insertions(+), 44 deletions(-)
+ 6 files changed, 128 insertions(+), 44 deletions(-)
 
 diff --git a/crypto/rsa/rsa_local.h b/crypto/rsa/rsa_local.h
 index ea70da05ad..dde57a1a0e 100644
@@ -119,32 +102,26 @@ index d9be1a4f98..b2f7f7dc4b 100644
                                      const unsigned char *from, int flen,
                                      const unsigned char *param, int plen,
 diff --git a/providers/fips/self_test_data.inc b/providers/fips/self_test_data.inc
-index 4e30ec56dd..0103c87528 100644
+index e0fdc0daa4..aa2012c04a 100644
 --- a/providers/fips/self_test_data.inc
 +++ b/providers/fips/self_test_data.inc
-@@ -1294,15 +1294,22 @@ static const ST_KAT_PARAM rsa_priv_key[] = {
-     ST_KAT_PARAM_END()
+@@ -1296,14 +1296,21 @@ static const ST_KAT_PARAM rsa_priv_key[] = {
  };
  
--/*-
+ /*-
 - * Using OSSL_PKEY_RSA_PAD_MODE_NONE directly in the expansion of the
-- * ST_KAT_PARAM_UTF8STRING macro below causes a failure on ancient
-- * HP/UX PA-RISC compilers.
-- */
--static const char pad_mode_none[] = OSSL_PKEY_RSA_PAD_MODE_NONE;
--
-+/*-
 + * Using OSSL_PKEY_RSA_PAD_MODE_OAEP directly in the expansion of the
-+ * ST_KAT_PARAM_UTF8STRING macro below causes a failure on ancient
-+ * HP/UX PA-RISC compilers.
-+ */
+  * ST_KAT_PARAM_UTF8STRING macro below causes a failure on ancient
+  * HP/UX PA-RISC compilers.
+  */
+-static const char pad_mode_none[] = OSSL_PKEY_RSA_PAD_MODE_NONE;
 +static const char pad_mode_oaep[] = OSSL_PKEY_RSA_PAD_MODE_OAEP;
 +static const char oaep_fixed_seed[] = {
 +    0xf6, 0x10, 0xef, 0x0a, 0x97, 0xbf, 0x91, 0x25,
 +    0x97, 0xcf, 0x8e, 0x0a, 0x75, 0x51, 0x2f, 0xab,
 +    0x2e, 0x4b, 0x2c, 0xe6
 +};
-+
+ 
  static const ST_KAT_PARAM rsa_enc_params[] = {
 -    ST_KAT_PARAM_UTF8STRING(OSSL_ASYM_CIPHER_PARAM_PAD_MODE, pad_mode_none),
 +    ST_KAT_PARAM_UTF8STRING(OSSL_ASYM_CIPHER_PARAM_PAD_MODE, pad_mode_oaep),
@@ -153,7 +130,7 @@ index 4e30ec56dd..0103c87528 100644
      ST_KAT_PARAM_END()
  };
  
-@@ -1335,43 +1348,43 @@ static const unsigned char rsa_expected_sig[256] = {
+@@ -1342,43 +1349,43 @@ static const unsigned char rsa_expected_sig[256] = {
      0x2c, 0x68, 0xf0, 0x37, 0xa9, 0xd2, 0x56, 0xd6
  };
  
@@ -231,10 +208,10 @@ index 4e30ec56dd..0103c87528 100644
  
  #ifndef OPENSSL_NO_EC
 diff --git a/providers/fips/self_test_kats.c b/providers/fips/self_test_kats.c
-index 064794d9bf..b6d5e8e134 100644
+index 74ee25dcb6..a9bc8be7fa 100644
 --- a/providers/fips/self_test_kats.c
 +++ b/providers/fips/self_test_kats.c
-@@ -647,14 +647,21 @@ static int self_test_ciphers(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
+@@ -641,14 +641,21 @@ static int self_test_ciphers(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
      return ret;
  }
  
@@ -257,7 +234,7 @@ index 064794d9bf..b6d5e8e134 100644
  }
  
 diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c
-index 00cf65fcd6..83be3d8ede 100644
+index 9cd8904131..40de5ce8fa 100644
 --- a/providers/implementations/asymciphers/rsa_enc.c
 +++ b/providers/implementations/asymciphers/rsa_enc.c
 @@ -30,6 +30,9 @@
@@ -280,7 +257,7 @@ index 00cf65fcd6..83be3d8ede 100644
      /* PKCS#1 v1.5 decryption mode */
      unsigned int implicit_rejection;
  } PROV_RSA_CTX;
-@@ -190,12 +196,21 @@ static int rsa_encrypt(void *vprsactx, unsigned char *out, size_t *outlen,
+@@ -192,12 +198,21 @@ static int rsa_encrypt(void *vprsactx, unsigned char *out, size_t *outlen,
              }
          }
          ret =
@@ -304,7 +281,7 @@ index 00cf65fcd6..83be3d8ede 100644
  
          if (!ret) {
              OPENSSL_free(tbuf);
-@@ -326,6 +341,9 @@ static void rsa_freectx(void *vprsactx)
+@@ -328,6 +343,9 @@ static void rsa_freectx(void *vprsactx)
      EVP_MD_free(prsactx->oaep_md);
      EVP_MD_free(prsactx->mgf1_md);
      OPENSSL_free(prsactx->oaep_label);
@@ -314,7 +291,7 @@ index 00cf65fcd6..83be3d8ede 100644
  
      OPENSSL_free(prsactx);
  }
-@@ -445,6 +463,9 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
+@@ -447,6 +465,9 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
                      NULL, 0),
      OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_TLS_CLIENT_VERSION, NULL),
      OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_TLS_NEGOTIATED_VERSION, NULL),
@@ -324,7 +301,7 @@ index 00cf65fcd6..83be3d8ede 100644
      OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION, NULL),
      OSSL_PARAM_END
  };
-@@ -454,6 +475,10 @@ static const OSSL_PARAM *rsa_gettable_ctx_params(ossl_unused void *vprsactx,
+@@ -456,6 +477,10 @@ static const OSSL_PARAM *rsa_gettable_ctx_params(ossl_unused void *vprsactx,
      return known_gettable_ctx_params;
  }
  
@@ -335,7 +312,7 @@ index 00cf65fcd6..83be3d8ede 100644
  static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
  {
      PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
-@@ -563,6 +588,18 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
+@@ -567,6 +592,18 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
          prsactx->oaep_labellen = tmp_labellen;
      }
  
@@ -354,10 +331,12 @@ index 00cf65fcd6..83be3d8ede 100644
      p = OSSL_PARAM_locate_const(params, OSSL_ASYM_CIPHER_PARAM_TLS_CLIENT_VERSION);
      if (p != NULL) {
          unsigned int client_version;
-diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
-index c37ed7815f..70f7c50fe4 100644
---- a/util/perl/OpenSSL/paramnames.pm
-+++ b/util/perl/OpenSSL/paramnames.pm
+-- 
+2.41.0
+
+diff -up openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.patch-config openssl-3.2.0/util/perl/OpenSSL/paramnames.pm
+--- openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.patch-config	2023-12-14 13:48:23.398025507 +0100
++++ openssl-3.2.0/util/perl/OpenSSL/paramnames.pm	2023-12-14 14:24:49.519488385 +0100
 @@ -401,6 +401,7 @@ my %params = (
      'ASYM_CIPHER_PARAM_TLS_CLIENT_VERSION' =>       "tls-client-version",
      'ASYM_CIPHER_PARAM_TLS_NEGOTIATED_VERSION' =>   "tls-negotiated-version",
@@ -366,6 +345,3 @@ index c37ed7815f..70f7c50fe4 100644
  
  # Encoder / decoder parameters
  
--- 
-2.37.1
-

SOURCES/0074-FIPS-Use-digest_sign-digest_verify-in-self-test.patch

@@ -1,25 +1,32 @@
-From dc41625dc4a793f0e21188165711181ca085339b Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 6 Mar 2024 19:17:16 +0100
-Subject: [PATCH 28/49] 
- 0074-FIPS-Use-digest_sign-digest_verify-in-self-test.patch
+From 97ac06e5a8e3a8699279c06eeb64c8e958bad7bd Mon Sep 17 00:00:00 2001
+From: Clemens Lang <cllang@redhat.com>
+Date: Fri, 15 Jul 2022 17:45:40 +0200
+Subject: [PATCH] FIPS: Use digest_sign & digest_verify in self test
 
-Patch-name: 0074-FIPS-Use-digest_sign-digest_verify-in-self-test.patch
-Patch-id: 74
-Patch-status: |
-    # [PATCH 29/46]
-    # 0074-FIPS-Use-digest_sign-digest_verify-in-self-test.patch
-From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
+In review for FIPS 140-3, the lack of a self-test for the digest_sign
+and digest_verify provider functions was highlighted as a problem. NIST
+no longer provides ACVP tests for the RSA SigVer primitive (see
+https://github.com/usnistgov/ACVP/issues/1347). Because FIPS 140-3
+recommends the use of functions that compute the digest and signature
+within the module, we have been advised in our module review that the
+self tests should also use the combined digest and signature APIs, i.e.
+the digest_sign and digest_verify provider functions.
+
+Modify the signature self-test to use these instead by switching to
+EVP_DigestSign and EVP_DigestVerify. This requires adding more ifdefs to
+crypto/evp/m_sigver.c to make these functions usable in the FIPS module.
+
+Signed-off-by: Clemens Lang <cllang@redhat.com>
 ---
- crypto/evp/m_sigver.c           | 54 ++++++++++++++++++++++++++++-----
- providers/fips/self_test_kats.c | 43 +++++++++++++++-----------
- 2 files changed, 73 insertions(+), 24 deletions(-)
+ crypto/evp/m_sigver.c           | 43 +++++++++++++++++++++++++++------
+ providers/fips/self_test_kats.c | 37 +++++++++++++++-------------
+ 2 files changed, 56 insertions(+), 24 deletions(-)
 
 diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
-index fd3a4b79df..3e9f33c26c 100644
+index db1a1d7bc3..c94c3c53bd 100644
 --- a/crypto/evp/m_sigver.c
 +++ b/crypto/evp/m_sigver.c
-@@ -90,6 +90,7 @@ static int update(EVP_MD_CTX *ctx, const void *data, size_t datalen)
+@@ -88,6 +88,7 @@ static int update(EVP_MD_CTX *ctx, const void *data, size_t datalen)
      ERR_raise(ERR_LIB_EVP, EVP_R_ONLY_ONESHOT_SUPPORTED);
      return 0;
  }
@@ -27,7 +34,7 @@ index fd3a4b79df..3e9f33c26c 100644
  
  /*
   * If we get the "NULL" md then the name comes back as "UNDEF". We want to use
-@@ -125,8 +126,10 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -130,8 +131,10 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
          reinit = 0;
          if (e == NULL)
              ctx->pctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, props);
@@ -38,7 +45,7 @@ index fd3a4b79df..3e9f33c26c 100644
      }
      if (ctx->pctx == NULL)
          return 0;
-@@ -136,8 +139,10 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -139,8 +142,10 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
      locpctx = ctx->pctx;
      ERR_set_mark();
  
@@ -49,7 +56,7 @@ index fd3a4b79df..3e9f33c26c 100644
  
      /* do not reinitialize if pkey is set or operation is different */
      if (reinit
-@@ -222,8 +227,10 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -225,8 +230,10 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
              signature =
                  evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
                                                supported_sig, locpctx->propquery);
@@ -60,7 +67,7 @@ index fd3a4b79df..3e9f33c26c 100644
              break;
          }
          if (signature == NULL)
-@@ -307,6 +314,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -310,6 +317,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
              ctx->fetched_digest = EVP_MD_fetch(locpctx->libctx, mdname, props);
              if (ctx->fetched_digest != NULL) {
                  ctx->digest = ctx->reqdigest = ctx->fetched_digest;
@@ -68,7 +75,7 @@ index fd3a4b79df..3e9f33c26c 100644
              } else {
                  /* legacy engine support : remove the mark when this is deleted */
                  ctx->reqdigest = ctx->digest = EVP_get_digestbyname(mdname);
-@@ -315,11 +323,13 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -318,11 +326,13 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
                      ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
                      goto err;
                  }
@@ -82,7 +89,7 @@ index fd3a4b79df..3e9f33c26c 100644
      if (ctx->reqdigest != NULL
              && !EVP_PKEY_is_a(locpctx->pkey, SN_hmac)
              && !EVP_PKEY_is_a(locpctx->pkey, SN_tls1_prf)
-@@ -331,6 +341,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -334,6 +344,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
              goto err;
          }
      }
@@ -90,7 +97,7 @@ index fd3a4b79df..3e9f33c26c 100644
  
      if (ver) {
          if (signature->digest_verify_init == NULL) {
-@@ -363,6 +374,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -366,6 +377,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
      EVP_KEYMGMT_free(tmp_keymgmt);
      return 0;
  
@@ -98,7 +105,7 @@ index fd3a4b79df..3e9f33c26c 100644
   legacy:
      /*
       * If we don't have the full support we need with provided methods,
-@@ -434,6 +446,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -437,6 +449,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
          ctx->pctx->flag_call_digest_custom = 1;
  
      ret = 1;
@@ -106,7 +113,7 @@ index fd3a4b79df..3e9f33c26c 100644
  
   end:
  #ifndef FIPS_MODULE
-@@ -476,7 +489,6 @@ int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
+@@ -479,7 +492,6 @@ int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
      return do_sigver_init(ctx, pctx, type, NULL, NULL, NULL, e, pkey, 1,
                            NULL);
  }
@@ -114,57 +121,7 @@ index fd3a4b79df..3e9f33c26c 100644
  
  int EVP_DigestSignUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
  {
-@@ -548,24 +560,31 @@ int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
-     return EVP_DigestUpdate(ctx, data, dsize);
- }
- 
--#ifndef FIPS_MODULE
- int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                         size_t *siglen)
- {
--    int sctx = 0, r = 0;
--    EVP_PKEY_CTX *dctx = NULL, *pctx = ctx->pctx;
-+    int r = 0;
-+#ifndef FIPS_MODULE
-+    int sctx = 0;
-+    EVP_PKEY_CTX *dctx = NULL;
-+#endif /* !defined(FIPS_MODULE) */
-+    EVP_PKEY_CTX *pctx = ctx->pctx;
-+ 
- 
-     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISED) != 0) {
-         ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR);
-         return 0;
-     }
- 
-+#ifndef FIPS_MODULE
-     if (pctx == NULL
-             || pctx->operation != EVP_PKEY_OP_SIGNCTX
-             || pctx->op.sig.algctx == NULL
-             || pctx->op.sig.signature == NULL)
-         goto legacy;
-+#endif /* !defined(FIPS_MODULE) */
- 
-+#ifndef FIPS_MODULE
-     if (sigret != NULL && (ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
-         /* try dup */
-         dctx = EVP_PKEY_CTX_dup(pctx);
-@@ -580,7 +599,14 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-     else
-         EVP_PKEY_CTX_free(dctx);
-     return r;
-+#else
-+    r = pctx->op.sig.signature->digest_sign_final(pctx->op.sig.algctx,
-+                                                  sigret, siglen,
-+                                                  sigret == NULL ? 0 : *siglen);
-+    return r;
-+#endif /* !defined(FIPS_MODULE) */
- 
-+#ifndef FIPS_MODULE
-  legacy:
-     if (pctx == NULL || pctx->pmeth == NULL) {
-         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
-@@ -653,6 +679,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
+@@ -639,6 +659,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
          }
      }
      return 1;
@@ -172,54 +129,7 @@ index fd3a4b79df..3e9f33c26c 100644
  }
  
  int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
-@@ -691,23 +718,30 @@ int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
- int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
-                           size_t siglen)
- {
--    unsigned char md[EVP_MAX_MD_SIZE];
-     int r = 0;
-+#ifndef FIPS_MODULE
-+    unsigned char md[EVP_MAX_MD_SIZE];
-     unsigned int mdlen = 0;
-     int vctx = 0;
--    EVP_PKEY_CTX *dctx = NULL, *pctx = ctx->pctx;
-+    EVP_PKEY_CTX *dctx = NULL;
-+#endif /* !defined(FIPS_MODULE) */
-+    EVP_PKEY_CTX *pctx = ctx->pctx;
-+ 
- 
-     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISED) != 0) {
-         ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR);
-         return 0;
-     }
- 
-+#ifndef FIPS_MODULE
-     if (pctx == NULL
-             || pctx->operation != EVP_PKEY_OP_VERIFYCTX
-             || pctx->op.sig.algctx == NULL
-             || pctx->op.sig.signature == NULL)
-         goto legacy;
-+#endif /* !defined(FIPS_MODULE) */
- 
-+#ifndef FIPS_MODULE
-     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
-         /* try dup */
-         dctx = EVP_PKEY_CTX_dup(pctx);
-@@ -721,7 +755,13 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
-     else
-         EVP_PKEY_CTX_free(dctx);
-     return r;
-+#else
-+    r = pctx->op.sig.signature->digest_verify_final(pctx->op.sig.algctx,
-+                                                    sig, siglen);
-+    return r;
-+#endif /* !defined(FIPS_MODULE) */
- 
-+#ifndef FIPS_MODULE
-  legacy:
-     if (pctx == NULL || pctx->pmeth == NULL) {
-         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
-@@ -762,6 +802,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
+@@ -732,6 +761,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
      if (vctx || !r)
          return r;
      return EVP_PKEY_verify(pctx, sig, siglen, md, mdlen);
@@ -227,16 +137,16 @@ index fd3a4b79df..3e9f33c26c 100644
  }
  
  int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret,
-@@ -794,4 +835,3 @@ int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret,
+@@ -757,4 +787,3 @@ int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret,
          return -1;
      return EVP_DigestVerifyFinal(ctx, sigret, siglen);
  }
 -#endif /* FIPS_MODULE */
 diff --git a/providers/fips/self_test_kats.c b/providers/fips/self_test_kats.c
-index 4ea10670c0..5eb27c8ed2 100644
+index b6d5e8e134..77eec075e6 100644
 --- a/providers/fips/self_test_kats.c
 +++ b/providers/fips/self_test_kats.c
-@@ -450,10 +450,13 @@ static int self_test_sign(const ST_KAT_SIGN *t,
+@@ -444,10 +444,13 @@ static int self_test_sign(const ST_KAT_SIGN *t,
      int ret = 0;
      OSSL_PARAM *params = NULL, *params_sig = NULL;
      OSSL_PARAM_BLD *bld = NULL;
@@ -251,7 +161,7 @@ index 4ea10670c0..5eb27c8ed2 100644
      size_t siglen = sizeof(sig);
      static const unsigned char dgst[] = {
          0x7f, 0x83, 0xb1, 0x65, 0x7f, 0xf1, 0xfc, 0x53, 0xb9, 0x2d, 0xc1, 0x81,
-@@ -487,23 +490,26 @@ static int self_test_sign(const ST_KAT_SIGN *t,
+@@ -488,23 +491,26 @@ static int self_test_sign(const ST_KAT_SIGN *t,
          || EVP_PKEY_fromdata(kctx, &pkey, EVP_PKEY_KEYPAIR, params) <= 0)
          goto err;
  
@@ -292,7 +202,7 @@ index 4ea10670c0..5eb27c8ed2 100644
          || EVP_PKEY_CTX_set_params(sctx, params_sig) <= 0)
          goto err;
  
-@@ -513,14 +519,17 @@ static int self_test_sign(const ST_KAT_SIGN *t,
+@@ -509,14 +510,17 @@ static int self_test_sign(const ST_KAT_SIGN *t,
          goto err;
  
      OSSL_SELF_TEST_oncorrupt_byte(st, sig);
@@ -313,5 +223,186 @@ index 4ea10670c0..5eb27c8ed2 100644
      OSSL_PARAM_free(params_sig);
      OSSL_PARAM_BLD_free(bld);
 -- 
-2.44.0
+2.37.1
 
+diff -up openssl-3.2.0/crypto/evp/m_sigver.c.digest-sign-patch openssl-3.2.0/crypto/evp/m_sigver.c
+--- openssl-3.2.0/crypto/evp/m_sigver.c.digest-sign-patch	2024-01-04 11:44:18.761559765 +0100
++++ openssl-3.2.0/crypto/evp/m_sigver.c	2024-01-04 11:51:18.297195401 +0100
+@@ -560,26 +560,33 @@ int EVP_DigestVerifyUpdate(EVP_MD_CTX *c
+     return EVP_DigestUpdate(ctx, data, dsize);
+ }
+ 
+-#ifndef FIPS_MODULE
+ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
+                         size_t *siglen)
+ {
+-    int sctx = 0, r = 0;
+-    EVP_PKEY_CTX *dctx = NULL, *pctx = ctx->pctx;
++    int r = 0;
++#ifndef FIPS_MODULE
++    int sctx = 0;
++    EVP_PKEY_CTX *dctx = NULL;
++#endif /* !defined(FIPS_MODULE) */
++    EVP_PKEY_CTX *pctx = ctx->pctx;
++ 
+ 
+     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISED) != 0) {
+         ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR);
+         return 0;
+     }
+ 
++#ifndef FIPS_MODULE
+     if (pctx == NULL
+             || pctx->operation != EVP_PKEY_OP_SIGNCTX
+             || pctx->op.sig.algctx == NULL
+             || pctx->op.sig.signature == NULL)
+         goto legacy;
++#endif /* !defined(FIPS_MODULE) */
+ 
+     if (sigret != NULL && (ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
+         /* try dup */
++#ifndef FIPS_MODULE
+         dctx = EVP_PKEY_CTX_dup(pctx);
+         if (dctx != NULL)
+             pctx = dctx;
+@@ -591,8 +598,10 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx,
+         ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
+     else
+         EVP_PKEY_CTX_free(dctx);
++#endif /* !defined(FIPS_MODULE) */
+     return r;
+ 
++#ifndef FIPS_MODULE
+  legacy:
+     if (pctx == NULL || pctx->pmeth == NULL) {
+         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
+@@ -704,25 +713,32 @@ int EVP_DigestSign(EVP_MD_CTX *ctx, unsi
+ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
+                           size_t siglen)
+ {
+-    unsigned char md[EVP_MAX_MD_SIZE];
+     int r = 0;
++#ifndef FIPS_MODULE
++    unsigned char md[EVP_MAX_MD_SIZE];
+     unsigned int mdlen = 0;
+     int vctx = 0;
+-    EVP_PKEY_CTX *dctx = NULL, *pctx = ctx->pctx;
++    EVP_PKEY_CTX *dctx = NULL;
++#endif /* !defined(FIPS_MODULE) */
++    EVP_PKEY_CTX *pctx = ctx->pctx;
++ 
+ 
+     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISED) != 0) {
+         ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR);
+         return 0;
+     }
+ 
++#ifndef FIPS_MODULE
+     if (pctx == NULL
+             || pctx->operation != EVP_PKEY_OP_VERIFYCTX
+             || pctx->op.sig.algctx == NULL
+             || pctx->op.sig.signature == NULL)
+         goto legacy;
++#endif /* !defined(FIPS_MODULE) */
+ 
+     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
+         /* try dup */
++#ifndef FIPS_MODULE
+         dctx = EVP_PKEY_CTX_dup(pctx);
+         if (dctx != NULL)
+             pctx = dctx;
+@@ -733,8 +749,10 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ct
+         ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
+     else
+         EVP_PKEY_CTX_free(dctx);
++#endif /* !defined(FIPS_MODULE) */
+     return r;
+ 
++#ifndef FIPS_MODULE
+  legacy:
+     if (pctx == NULL || pctx->pmeth == NULL) {
+         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
+diff -up openssl-3.2.0/crypto/evp/m_sigver.c.digest-sign-patch openssl-3.2.0/crypto/evp/m_sigver.c
+--- openssl-3.2.0/crypto/evp/m_sigver.c.digest-sign-patch	2024-01-04 12:39:26.858137284 +0100
++++ openssl-3.2.0/crypto/evp/m_sigver.c	2024-01-04 12:40:28.201680446 +0100
+@@ -736,9 +736,9 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ct
+         goto legacy;
+ #endif /* !defined(FIPS_MODULE) */
+ 
++#ifndef FIPS_MODULE
+     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
+         /* try dup */
+-#ifndef FIPS_MODULE
+         dctx = EVP_PKEY_CTX_dup(pctx);
+         if (dctx != NULL)
+             pctx = dctx;
+diff -up openssl-3.2.0/crypto/evp/m_sigver.c.digest-sign-patch openssl-3.2.0/crypto/evp/m_sigver.c
+--- openssl-3.2.0/crypto/evp/m_sigver.c.digest-sign-patch	2024-01-04 12:55:41.172653897 +0100
++++ openssl-3.2.0/crypto/evp/m_sigver.c	2024-01-04 12:56:23.562017396 +0100
+@@ -584,9 +584,9 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx,
+         goto legacy;
+ #endif /* !defined(FIPS_MODULE) */
+ 
++#ifndef FIPS_MODULE
+     if (sigret != NULL && (ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
+         /* try dup */
+-#ifndef FIPS_MODULE
+         dctx = EVP_PKEY_CTX_dup(pctx);
+         if (dctx != NULL)
+             pctx = dctx;
+diff -up openssl-3.2.0/crypto/evp/m_sigver.c.fips-new openssl-3.2.0/crypto/evp/m_sigver.c
+--- openssl-3.2.0/crypto/evp/m_sigver.c.fips-new	2024-01-30 23:50:10.115710238 +0100
++++ openssl-3.2.0/crypto/evp/m_sigver.c	2024-01-31 00:04:31.448164500 +0100
+@@ -598,7 +598,11 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx,
+         ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
+     else
+         EVP_PKEY_CTX_free(dctx);
++    return r;
+ #endif /* !defined(FIPS_MODULE) */
++    r = pctx->op.sig.signature->digest_sign_final(pctx->op.sig.algctx,
++                                                  sigret, siglen,
++                                                  sigret == NULL ? 0 : *siglen);
+     return r;
+ 
+ #ifndef FIPS_MODULE
+@@ -749,7 +753,10 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ct
+         ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
+     else
+         EVP_PKEY_CTX_free(dctx);
++    return r;
+ #endif /* !defined(FIPS_MODULE) */
++    r = pctx->op.sig.signature->digest_verify_final(pctx->op.sig.algctx,
++                                                    sig, siglen);
+     return r;
+ 
+ #ifndef FIPS_MODULE
+diff -up openssl-3.2.0/crypto/evp/m_sigver.c.fix-ifdef openssl-3.2.0/crypto/evp/m_sigver.c
+--- openssl-3.2.0/crypto/evp/m_sigver.c.fix-ifdef	2024-02-01 09:23:07.877696442 +0100
++++ openssl-3.2.0/crypto/evp/m_sigver.c	2024-02-01 09:25:30.857169997 +0100
+@@ -599,11 +599,12 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx,
+     else
+         EVP_PKEY_CTX_free(dctx);
+     return r;
+-#endif /* !defined(FIPS_MODULE) */
++#else
+     r = pctx->op.sig.signature->digest_sign_final(pctx->op.sig.algctx,
+                                                   sigret, siglen,
+                                                   sigret == NULL ? 0 : *siglen);
+     return r;
++#endif /* !defined(FIPS_MODULE) */
+ 
+ #ifndef FIPS_MODULE
+  legacy:
+@@ -754,10 +755,11 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ct
+     else
+         EVP_PKEY_CTX_free(dctx);
+     return r;
+-#endif /* !defined(FIPS_MODULE) */
++#else
+     r = pctx->op.sig.signature->digest_verify_final(pctx->op.sig.algctx,
+                                                     sig, siglen);
+     return r;
++#endif /* !defined(FIPS_MODULE) */
+ 
+ #ifndef FIPS_MODULE
+  legacy:

SOURCES/0076-FIPS-140-3-DRBG.patch

@@ -1,3 +1,22 @@
+From 0329eb6523363705946887d4f145dd77c741ae4a Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 6 Mar 2024 19:17:16 +0100
+Subject: [PATCH 30/49] 0076-FIPS-140-3-DRBG.patch
+
+Patch-name: 0076-FIPS-140-3-DRBG.patch
+Patch-id: 76
+Patch-status: |
+    # # Downstream only. Reseed DRBG using getrandom(GRND_RANDOM)
+    # # https://bugzilla.redhat.com/show_bug.cgi?id=2102541
+From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
+---
+ crypto/rand/prov_seed.c                       |  9 ++-
+ providers/implementations/rands/crngt.c       |  6 +-
+ providers/implementations/rands/drbg.c        | 11 ++-
+ providers/implementations/rands/drbg_local.h  |  2 +-
+ .../implementations/rands/seeding/rand_unix.c | 68 ++-----------------
+ 5 files changed, 28 insertions(+), 68 deletions(-)
+
 diff -up openssl-3.0.1/crypto/rand/prov_seed.c.fipsrand openssl-3.0.1/crypto/rand/prov_seed.c
 --- openssl-3.0.1/crypto/rand/prov_seed.c.fipsrand	2022-08-04 12:17:52.148556301 +0200
 +++ openssl-3.0.1/crypto/rand/prov_seed.c	2022-08-04 12:19:41.783533552 +0200

SOURCES/0077-FIPS-140-3-zeroization.patch

@@ -1,7 +1,47 @@
-diff -up openssl-3.0.1/crypto/ffc/ffc_params.c.fipszero openssl-3.0.1/crypto/ffc/ffc_params.c
---- openssl-3.0.1/crypto/ffc/ffc_params.c.fipszero	2022-08-05 13:11:27.211413931 +0200
-+++ openssl-3.0.1/crypto/ffc/ffc_params.c	2022-08-05 13:11:34.151475891 +0200
-@@ -27,10 +27,10 @@ void ossl_ffc_params_init(FFC_PARAMS *pa
+From 9c667a7ba589329f3a777b012bf69a0db7f7eda9 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 31 Jul 2023 09:41:29 +0200
+Subject: [PATCH 33/35] 0077-FIPS-140-3-zeroization.patch
+
+Patch-name: 0077-FIPS-140-3-zeroization.patch
+Patch-id: 77
+Patch-status: |
+    # https://bugzilla.redhat.com/show_bug.cgi?id=2102542
+From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
+---
+ crypto/ec/ec_lib.c                      | 4 ++++
+ crypto/ffc/ffc_params.c                 | 8 ++++----
+ crypto/rsa/rsa_lib.c                    | 4 ++--
+ providers/implementations/kdfs/hkdf.c   | 2 +-
+ providers/implementations/kdfs/pbkdf2.c | 2 +-
+ 5 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
+index 6c37bf78ae..cfbc3c3c1d 100644
+--- a/crypto/ec/ec_lib.c
++++ b/crypto/ec/ec_lib.c
+@@ -744,12 +744,16 @@ EC_POINT *EC_POINT_new(const EC_GROUP *group)
+ 
+ void EC_POINT_free(EC_POINT *point)
+ {
++#ifdef FIPS_MODULE
++    EC_POINT_clear_free(point);
++#else
+     if (point == NULL)
+         return;
+ 
+     if (point->meth->point_finish != 0)
+         point->meth->point_finish(point);
+     OPENSSL_free(point);
++#endif
+ }
+ 
+ void EC_POINT_clear_free(EC_POINT *point)
+diff --git a/crypto/ffc/ffc_params.c b/crypto/ffc/ffc_params.c
+index 3536efd1ad..f3c164b8fc 100644
+--- a/crypto/ffc/ffc_params.c
++++ b/crypto/ffc/ffc_params.c
+@@ -27,10 +27,10 @@ void ossl_ffc_params_init(FFC_PARAMS *params)
  
  void ossl_ffc_params_cleanup(FFC_PARAMS *params)
  {
@@ -16,9 +56,10 @@ diff -up openssl-3.0.1/crypto/ffc/ffc_params.c.fipszero openssl-3.0.1/crypto/ffc
      OPENSSL_free(params->seed);
      ossl_ffc_params_init(params);
  }
-diff -up openssl-3.0.1/crypto/rsa/rsa_lib.c.fipszero openssl-3.0.1/crypto/rsa/rsa_lib.c
---- openssl-3.0.1/crypto/rsa/rsa_lib.c.fipszero	2022-08-05 13:08:31.875848536 +0200
-+++ openssl-3.0.1/crypto/rsa/rsa_lib.c	2022-08-05 13:09:35.438416025 +0200
+diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
+index 9588a75964..76b4aac6fc 100644
+--- a/crypto/rsa/rsa_lib.c
++++ b/crypto/rsa/rsa_lib.c
 @@ -155,8 +155,8 @@ void RSA_free(RSA *r)
      CRYPTO_THREAD_lock_free(r->lock);
      CRYPTO_FREE_REF(&r->references);
@@ -30,10 +71,11 @@ diff -up openssl-3.0.1/crypto/rsa/rsa_lib.c.fipszero openssl-3.0.1/crypto/rsa/rs
      BN_clear_free(r->d);
      BN_clear_free(r->p);
      BN_clear_free(r->q);
-diff -up openssl-3.0.1/providers/implementations/kdfs/hkdf.c.fipszero openssl-3.0.1/providers/implementations/kdfs/hkdf.c
---- openssl-3.0.1/providers/implementations/kdfs/hkdf.c.fipszero	2022-08-05 13:14:58.827303241 +0200
-+++ openssl-3.0.1/providers/implementations/kdfs/hkdf.c	2022-08-05 13:16:24.530068399 +0200
-@@ -116,7 +116,7 @@ static void kdf_hkdf_reset(void *vctx)
+diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c
+index daa619b8af..5304baa6c9 100644
+--- a/providers/implementations/kdfs/hkdf.c
++++ b/providers/implementations/kdfs/hkdf.c
+@@ -118,7 +118,7 @@ static void kdf_hkdf_reset(void *vctx)
      void *provctx = ctx->provctx;
  
      ossl_prov_digest_reset(&ctx->digest);
@@ -42,10 +84,11 @@ diff -up openssl-3.0.1/providers/implementations/kdfs/hkdf.c.fipszero openssl-3.
      OPENSSL_free(ctx->prefix);
      OPENSSL_free(ctx->label);
      OPENSSL_clear_free(ctx->data, ctx->data_len);
-diff -up openssl-3.0.1/providers/implementations/kdfs/pbkdf2.c.fipszero openssl-3.0.1/providers/implementations/kdfs/pbkdf2.c
---- openssl-3.0.1/providers/implementations/kdfs/pbkdf2.c.fipszero	2022-08-05 13:12:40.552068717 +0200
-+++ openssl-3.0.1/providers/implementations/kdfs/pbkdf2.c	2022-08-05 13:13:34.324548799 +0200
-@@ -83,7 +83,7 @@ static void *kdf_pbkdf2_new(void *provct
+diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c
+index 5c3e7b95ce..349c3dd657 100644
+--- a/providers/implementations/kdfs/pbkdf2.c
++++ b/providers/implementations/kdfs/pbkdf2.c
+@@ -92,7 +92,7 @@ static void *kdf_pbkdf2_new(void *provctx)
  static void kdf_pbkdf2_cleanup(KDF_PBKDF2 *ctx)
  {
      ossl_prov_digest_reset(&ctx->digest);
@@ -54,23 +97,6 @@ diff -up openssl-3.0.1/providers/implementations/kdfs/pbkdf2.c.fipszero openssl-
      OPENSSL_clear_free(ctx->pass, ctx->pass_len);
      memset(ctx, 0, sizeof(*ctx));
  }
-diff -up openssl-3.0.1/crypto/ec/ec_lib.c.fipszero openssl-3.0.1/crypto/ec/ec_lib.c
---- openssl-3.0.1/crypto/ec/ec_lib.c.fipszero	2022-08-05 13:48:32.221345774 +0200
-+++ openssl-3.0.1/crypto/ec/ec_lib.c	2022-08-05 13:49:16.138741452 +0200
-@@ -744,12 +744,16 @@ EC_POINT *EC_POINT_new(const EC_GROUP *g
- 
- void EC_POINT_free(EC_POINT *point)
- {
-+#ifdef FIPS_MODULE
-+    EC_POINT_clear_free(point);
-+#else
-     if (point == NULL)
-         return;
- 
-     if (point->meth->point_finish != 0)
-         point->meth->point_finish(point);
-     OPENSSL_free(point);
-+#endif
- }
- 
- void EC_POINT_clear_free(EC_POINT *point)
+-- 
+2.41.0
+

SOURCES/0080-rand-Forbid-truncated-hashes-SHA-3-in-FIPS-prov.patch

@@ -1,26 +1,14 @@
-From 6aed6931cf50499e778a6d34502f9bf82f5a4c0d Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Wed, 16 Nov 2022 13:53:24 +0100
-Subject: [PATCH] rand: Forbid truncated hashes & SHA-3 in FIPS prov
+From 936e081bd752ca0a883568aaf3b5752c9eaccb12 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 15:38:21 +0200
+Subject: [PATCH 36/48] 
+ 0080-rand-Forbid-truncated-hashes-SHA-3-in-FIPS-prov.patch
 
-Section D.R "Hash Functions Acceptable for Use in the SP 800-90A DRBGs"
-of the Implementation Guidance for FIPS 140-3 [1] notes that there is no
-efficiency improvement when using truncated hash functions (i.e. SHA-224
-rather than SHA-256 or SHA-384, SHA-512/224, or SHA512/256 rather than
-SHA-512). Starting on 2023-05-16, all submissions to NIST's
-Cryptographic Module Validation Program shall only use SHA-1, SHA-256,
-or SHA-512.
-
-NIST further notes that the same will apply for the truncated versions
-of SHA-3, i.e. SHA3-224 and SHA3-384, and that SHA-3 should currently
-not be used.
-
-Adjust tests to only run Hash-DRBG and HMAC-DRBG tests with truncated
-algorithms in the default provider.
-
-[1]: https://csrc.nist.gov/CSRC/media/Projects/cryptographic-module-validation-program/documents/fips%20140-3/FIPS%20140-3%20IG.pdf
-
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0080-rand-Forbid-truncated-hashes-SHA-3-in-FIPS-prov.patch
+Patch-id: 80
+Patch-status: |
+    # We believe that some changes present in CentOS are not necessary
+    # because ustream has a check for FIPS version
 ---
  providers/implementations/rands/drbg_hash.c |  12 ++
  providers/implementations/rands/drbg_hmac.c |  12 ++
@@ -28,7 +16,7 @@ Signed-off-by: Clemens Lang <cllang@redhat.com>
  3 files changed, 153 insertions(+)
 
 diff --git a/providers/implementations/rands/drbg_hash.c b/providers/implementations/rands/drbg_hash.c
-index 12faa993d0..5f9602cf84 100644
+index fb824abfa6..b90fee6dec 100644
 --- a/providers/implementations/rands/drbg_hash.c
 +++ b/providers/implementations/rands/drbg_hash.c
 @@ -471,6 +471,18 @@ static int drbg_hash_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -51,7 +39,7 @@ index 12faa993d0..5f9602cf84 100644
          hash->blocklen = EVP_MD_get_size(md);
          /* See SP800-57 Part1 Rev4 5.6.1 Table 3 */
 diff --git a/providers/implementations/rands/drbg_hmac.c b/providers/implementations/rands/drbg_hmac.c
-index ffeb70f8c3..79ed96a15a 100644
+index 664a074639..cbd4d0f519 100644
 --- a/providers/implementations/rands/drbg_hmac.c
 +++ b/providers/implementations/rands/drbg_hmac.c
 @@ -367,6 +367,18 @@ static int drbg_hmac_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -74,7 +62,7 @@ index ffeb70f8c3..79ed96a15a 100644
                                             NULL, NULL, NULL, libctx))
          return 0;
 diff --git a/test/recipes/30-test_evp_data/evprand.txt b/test/recipes/30-test_evp_data/evprand.txt
-index 8cb70247a0..8a0a2dea15 100644
+index 0e2ee82c58..7a17e7b3e1 100644
 --- a/test/recipes/30-test_evp_data/evprand.txt
 +++ b/test/recipes/30-test_evp_data/evprand.txt
 @@ -7388,6 +7388,7 @@ Nonce.14 = 7239f92b63fb3dbe
@@ -1110,5 +1098,5 @@ index 8cb70247a0..8a0a2dea15 100644
  Digest = SHA-512
  PredictionResistance = 1
 -- 
-2.38.1
+2.41.0
 

SOURCES/0081-signature-Remove-X9.31-padding-from-FIPS-prov.patch

@@ -1,36 +1,21 @@
-From 4de5fa26873297f5c2eeed53e5c988437f837f55 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Thu, 17 Nov 2022 13:53:31 +0100
-Subject: [PATCH] signature: Remove X9.31 padding from FIPS prov
+From 930e7acf7dd225102b6e88d23f5e2a3f4acea9fa Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 15:43:57 +0200
+Subject: [PATCH 37/48] 
+ 0081-signature-Remove-X9.31-padding-from-FIPS-prov.patch
 
-The current draft of FIPS 186-5 [1] no longer contains specifications
-for X9.31 signature padding. Instead, it contains the following
-information in Appendix E:
-
-> ANSI X9.31 was withdrawn, so X9.31 RSA signatures were removed from
-> this standard.
-
-Since this situation is unlikely to change in future revisions of the
-draft, and future FIPS 140-3 validations of the provider will require
-X9.31 to be disabled or marked as not approved with an explicit
-indicator, disallow this padding mode now.
-
-Remove the X9.31 tests from the acvp test, since they will always fail
-now.
-
- [1]: https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5-draft.pdf
-
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0081-signature-Remove-X9.31-padding-from-FIPS-prov.patch
+Patch-id: 81
 ---
  providers/implementations/signature/rsa_sig.c |   6 +
  test/acvp_test.inc                            | 214 ------------------
  2 files changed, 6 insertions(+), 214 deletions(-)
 
 diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c
-index 34f45175e8..49e7f9158a 100644
+index 63ee11e566..cfaa4841cb 100644
 --- a/providers/implementations/signature/rsa_sig.c
 +++ b/providers/implementations/signature/rsa_sig.c
-@@ -1233,7 +1233,13 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
+@@ -1279,7 +1279,13 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
              err_extra_text = "No padding not allowed with RSA-PSS";
              goto cont;
          case RSA_X931_PADDING:
@@ -284,5 +269,5 @@ index 73b24bdb0c..96a72073f9 100644
          "pss",
          4096,
 -- 
-2.38.1
+2.41.0
 

SOURCES/0083-hmac-Add-explicit-FIPS-indicator-for-key-length.patch

@@ -1,19 +1,11 @@
-From e1eba21921ceeffa45ffd2115868c14e4c7fb8d9 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Thu, 17 Nov 2022 18:08:24 +0100
-Subject: [PATCH] hmac: Add explicit FIPS indicator for key length
+From 8e388e194e665286a8996d7d5926bab5c1a6b4f9 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 15:46:40 +0200
+Subject: [PATCH 38/48] 
+ 0083-hmac-Add-explicit-FIPS-indicator-for-key-length.patch
 
-NIST SP 800-131Ar2, table 9 "Approval Status of MAC Algorithms"
-specifies key lengths < 112 bytes are disallowed for HMAC generation and
-are legacy use for HMAC verification.
-
-Add an explicit indicator that will mark shorter key lengths as
-unsupported. The indicator can be queries from the EVP_MAC_CTX object
-using EVP_MAC_CTX_get_params() with the
-  OSSL_MAC_PARAM_REDHAT_FIPS_INDICATOR
-parameter.
-
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0083-hmac-Add-explicit-FIPS-indicator-for-key-length.patch
+Patch-id: 83
 ---
  include/crypto/evp.h                       |  7 +++++++
  include/openssl/evp.h                      |  3 +++
@@ -21,7 +13,7 @@ Signed-off-by: Clemens Lang <cllang@redhat.com>
  4 files changed, 28 insertions(+)
 
 diff --git a/include/crypto/evp.h b/include/crypto/evp.h
-index 76fb990de4..1e2240516e 100644
+index aa07153441..a13127bd59 100644
 --- a/include/crypto/evp.h
 +++ b/include/crypto/evp.h
 @@ -196,6 +196,13 @@ const EVP_PKEY_METHOD *ossl_ed448_pkey_method(void);
@@ -39,10 +31,10 @@ index 76fb990de4..1e2240516e 100644
      OSSL_PROVIDER *prov;
      int name_id;
 diff --git a/include/openssl/evp.h b/include/openssl/evp.h
-index 49e8e1df78..a5e78efd6e 100644
+index 86f4e22c70..615857caf5 100644
 --- a/include/openssl/evp.h
 +++ b/include/openssl/evp.h
-@@ -1192,6 +1192,9 @@ void EVP_MD_do_all_provided(OSSL_LIB_CTX *libctx,
+@@ -1194,6 +1194,9 @@ void EVP_MD_do_all_provided(OSSL_LIB_CTX *libctx,
                              void *arg);
  
  /* MAC stuff */
@@ -63,7 +55,7 @@ index 52ebb08b8f..cf5c3ecbe7 100644
 +#include "crypto/evp.h"
 +
  #include "internal/ssl3_cbc.h"
- 
+
  #include "prov/implementations.h"
 @@ -244,6 +246,9 @@ static int hmac_final(void *vmacctx, unsigned char *out, size_t *outl,
  static const OSSL_PARAM known_gettable_ctx_params[] = {
@@ -94,10 +86,12 @@ index 52ebb08b8f..cf5c3ecbe7 100644
      return 1;
  }
  
-diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
-index 6618122417..8b2d430f17 100644
---- a/util/perl/OpenSSL/paramnames.pm
-+++ b/util/perl/OpenSSL/paramnames.pm
+-- 
+2.41.0
+
+diff -up openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.hmac-patch openssl-3.2.0/util/perl/OpenSSL/paramnames.pm
+--- openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.hmac-patch	2024-01-02 12:18:16.909596613 +0100
++++ openssl-3.2.0/util/perl/OpenSSL/paramnames.pm	2024-01-02 12:20:18.465886160 +0100
 @@ -137,12 +137,13 @@ my %params = (
  # If "engine",or "properties",are specified, they should always be paired
  # with "cipher",or "digest".
@@ -118,6 +112,3 @@ index 6618122417..8b2d430f17 100644
  
  # KDF / PRF parameters
      'KDF_PARAM_SECRET' =>       "secret",                   # octet string
--- 
-2.38.1
-

SOURCES/0084-pbkdf2-Set-minimum-password-length-of-8-bytes.patch

@@ -1,34 +1,17 @@
-From 754862899058cfb5f2341c81f9e04dd2f7b37056 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Thu, 17 Nov 2022 18:37:17 +0100
-Subject: [PATCH] pbkdf2: Set minimum password length of 8 bytes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From 915990e450e769e370fcacbfd8ed58ab6afaf2bf Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 15:47:55 +0200
+Subject: [PATCH 39/48] 
+ 0084-pbkdf2-Set-minimum-password-length-of-8-bytes.patch
 
-The Implementation Guidance for FIPS 140-3 says in section D.N
-"Password-Based Key Derivation for Storage Applications" that "the
-vendor shall document in the module’s Security Policy the length of
-a password/passphrase used in key derivation and establish an upper
-bound for the probability of having this parameter guessed at random.
-This probability shall take into account not only the length of the
-password/passphrase, but also the difficulty of guessing it. The
-decision on the minimum length of a password used for key derivation is
-the vendor’s, but the vendor shall at a minimum informally justify the
-decision."
-
-We are choosing a minimum password length of 8 bytes, because NIST's
-ACVP testing uses passwords as short as 8 bytes, and requiring longer
-passwords combined with an implicit indicator (i.e., returning an error)
-would cause the module to fail ACVP testing.
-
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0084-pbkdf2-Set-minimum-password-length-of-8-bytes.patch
+Patch-id: 84
 ---
  providers/implementations/kdfs/pbkdf2.c | 27 ++++++++++++++++++++++++-
  1 file changed, 26 insertions(+), 1 deletion(-)
 
 diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c
-index 2a0ae63acc..aa0adce5e6 100644
+index 349c3dd657..11820d1e69 100644
 --- a/providers/implementations/kdfs/pbkdf2.c
 +++ b/providers/implementations/kdfs/pbkdf2.c
 @@ -35,6 +35,21 @@
@@ -53,7 +36,7 @@ index 2a0ae63acc..aa0adce5e6 100644
  
  static OSSL_FUNC_kdf_newctx_fn kdf_pbkdf2_new;
  static OSSL_FUNC_kdf_dupctx_fn kdf_pbkdf2_dup;
-@@ -186,9 +201,15 @@ static int kdf_pbkdf2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
+@@ -219,9 +234,15 @@ static int kdf_pbkdf2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
          ctx->lower_bound_checks = pkcs5 == 0;
      }
  
@@ -70,7 +53,7 @@ index 2a0ae63acc..aa0adce5e6 100644
  
      if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_SALT)) != NULL) {
          if (ctx->lower_bound_checks != 0
-@@ -297,6 +318,10 @@ static int pbkdf2_derive(const char *pass, size_t passlen,
+@@ -331,6 +352,10 @@ static int pbkdf2_derive(const char *pass, size_t passlen,
      }
  
      if (lower_bound_checks) {
@@ -82,5 +65,5 @@ index 2a0ae63acc..aa0adce5e6 100644
              ERR_raise(ERR_LIB_PROV, PROV_R_KEY_SIZE_TOO_SMALL);
              return 0;
 -- 
-2.38.1
+2.41.0
 

SOURCES/0085-FIPS-RSA-disable-shake.patch

@@ -1,32 +1,20 @@
-From 52b347703ba2b98a0efee86c1a483c2f0f9f73d6 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Wed, 11 Jan 2023 12:52:59 +0100
-Subject: [PATCH] rsa: Disallow SHAKE in OAEP and PSS in FIPS prov
+From 2306fde5556cbcb875d095c09fed01a0f16fe7ec Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 15:51:55 +0200
+Subject: [PATCH 40/48] 0085-FIPS-RSA-disable-shake.patch
 
-According to FIPS 140-3 IG, section C.C, the SHAKE digest algorithms
-must not be used in higher-level algorithms (such as RSA-OAEP and
-RSASSA-PSS):
-
-"To be used in an approved mode of operation, the SHA-3 hash functions
-may be implemented either as part of an approved higher-level algorithm,
-for example, a digital signature algorithm, or as the standalone
-functions. The SHAKE128 and SHAKE256 extendable-output functions may
-only be used as the standalone algorithms."
-
-Add a check to prevent their use as message digest in PSS signatures and
-as MGF1 hash function in both OAEP and PSS.
-
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0085-FIPS-RSA-disable-shake.patch
+Patch-id: 85
 ---
  crypto/rsa/rsa_oaep.c | 28 ++++++++++++++++++++++++++++
  crypto/rsa/rsa_pss.c  | 16 ++++++++++++++++
  2 files changed, 44 insertions(+)
 
 diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
-index d9be1a4f98..dfe9c9f0e8 100644
+index b2f7f7dc4b..af2b0b026c 100644
 --- a/crypto/rsa/rsa_oaep.c
 +++ b/crypto/rsa/rsa_oaep.c
-@@ -73,9 +73,23 @@ int ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(OSSL_LIB_CTX *libctx,
+@@ -78,9 +78,23 @@ int ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex2(OSSL_LIB_CTX *libctx,
          return 0;
  #endif
      }
@@ -50,7 +38,7 @@ index d9be1a4f98..dfe9c9f0e8 100644
      mdlen = EVP_MD_get_size(md);
      if (mdlen <= 0) {
          ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_LENGTH);
-@@ -181,9 +195,23 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
+@@ -203,9 +217,23 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
  #endif
      }
  
@@ -75,7 +63,7 @@ index d9be1a4f98..dfe9c9f0e8 100644
  
      if (tlen <= 0 || flen <= 0)
 diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
-index 33874bfef8..e8681b0351 100644
+index bb46ec64c7..c0fdf232da 100644
 --- a/crypto/rsa/rsa_pss.c
 +++ b/crypto/rsa/rsa_pss.c
 @@ -53,6 +53,14 @@ int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
@@ -93,7 +81,7 @@ index 33874bfef8..e8681b0351 100644
      hLen = EVP_MD_get_size(Hash);
      if (hLen < 0)
          goto err;
-@@ -164,6 +172,14 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
+@@ -168,6 +176,14 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
      if (mgf1Hash == NULL)
          mgf1Hash = Hash;
  
@@ -109,5 +97,5 @@ index 33874bfef8..e8681b0351 100644
      if (hLen < 0)
          goto err;
 -- 
-2.39.0
+2.41.0
 

SOURCES/0088-signature-Add-indicator-for-PSS-salt-length.patch

@@ -1,55 +1,20 @@
-From a325a23bc83f4efd60130001c417ca5b96bdbff1 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Thu, 17 Nov 2022 19:33:02 +0100
-Subject: [PATCH 1/3] signature: Add indicator for PSS salt length
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From 98ee6faef3da1439c04f11cd2796132d27d1e607 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 15:58:07 +0200
+Subject: [PATCH 41/48] 0088-signature-Add-indicator-for-PSS-salt-length.patch
 
-FIPS 186-4 section 5 "The RSA Digital Signature Algorithm", subsection
-5.5 "PKCS #1" says: "For RSASSA-PSS […] the length (in bytes) of the
-salt (sLen) shall satisfy 0 ≤ sLen ≤ hLen, where hLen is the length of
-the hash function output block (in bytes)."
-
-It is not exactly clear from this text whether hLen refers to the
-message digest or the hash function used for the mask generation
-function MGF1. PKCS#1 v2.1 suggests it is the former:
-
-| Typical salt lengths in octets are hLen (the length of the output of
-| the hash function Hash) and 0. In both cases the security of
-| RSASSA-PSS can be closely related to the hardness of inverting RSAVP1.
-| Bellare and Rogaway [4] give a tight lower bound for the security of
-| the original RSA-PSS scheme, which corresponds roughly to the former
-| case, while Coron [12] gives a lower bound for the related Full Domain
-| Hashing scheme, which corresponds roughly to the latter case. In [13]
-| Coron provides a general treatment with various salt lengths ranging
-| from 0 to hLen; see [27] for discussion. See also [31], which adapts
-| the security proofs in [4][13] to address the differences between the
-| original and the present version of RSA-PSS as listed in Note 1 above.
-
-Since OpenSSL defaults to creating signatures with the maximum salt
-length, blocking the use of longer salts would probably lead to
-significant problems in practice. Instead, introduce an explicit
-indicator that can be obtained from the EVP_PKEY_CTX object using
-EVP_PKEY_CTX_get_params() with the
-  OSSL_SIGNATURE_PARAM_REDHAT_FIPS_INDICATOR
-parameter.
-
-We also add indicator for RSA_NO_PADDING here to avoid patch-over-patch.
-Dmitry Belyavskiy <dbelyavs@redhat.com>
-
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0088-signature-Add-indicator-for-PSS-salt-length.patch
+Patch-id: 88
 ---
  include/openssl/evp.h                         |  4 ++++
- providers/implementations/signature/rsa_sig.c | 21 +++++++++++++++++
- util/perl/OpenSSL/paramnames.pm               | 23 ++++++++++---------
- 3 files changed, 37 insertions(+), 11 deletions(-)
+ providers/implementations/signature/rsa_sig.c | 21 +++++++++++++++++++
+ 3 files changed, 26 insertions(+)
 
 diff --git a/include/openssl/evp.h b/include/openssl/evp.h
-index a5e78efd6e..f239200465 100644
+index 615857caf5..05f2d0f75a 100644
 --- a/include/openssl/evp.h
 +++ b/include/openssl/evp.h
-@@ -797,6 +797,10 @@ __owur int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
+@@ -799,6 +799,10 @@ __owur int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
  __owur int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm,
                                int *outl);
  
@@ -61,10 +26,10 @@ index a5e78efd6e..f239200465 100644
                           EVP_PKEY *pkey);
  __owur int EVP_SignFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s,
 diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c
-index 49e7f9158a..0c45008a00 100644
+index cfaa4841cb..851671cfb1 100644
 --- a/providers/implementations/signature/rsa_sig.c
 +++ b/providers/implementations/signature/rsa_sig.c
-@@ -1127,6 +1127,24 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
+@@ -1173,6 +1173,24 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
          }
      }
  
@@ -89,7 +54,7 @@ index 49e7f9158a..0c45008a00 100644
      return 1;
  }
  
-@@ -1136,6 +1151,9 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
+@@ -1182,6 +1200,9 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
      OSSL_PARAM_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST, NULL, 0),
      OSSL_PARAM_utf8_string(OSSL_SIGNATURE_PARAM_MGF1_DIGEST, NULL, 0),
      OSSL_PARAM_utf8_string(OSSL_SIGNATURE_PARAM_PSS_SALTLEN, NULL, 0),
@@ -99,10 +64,12 @@ index 49e7f9158a..0c45008a00 100644
      OSSL_PARAM_END
  };
  
-diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
-index 8b2d430f17..a109e44521 100644
---- a/util/perl/OpenSSL/paramnames.pm
-+++ b/util/perl/OpenSSL/paramnames.pm
+-- 
+2.41.0
+
+diff -up openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.salt-patch openssl-3.2.0/util/perl/OpenSSL/paramnames.pm
+--- openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.salt-patch	2024-01-02 12:23:57.106998142 +0100
++++ openssl-3.2.0/util/perl/OpenSSL/paramnames.pm	2024-01-02 12:26:29.687472015 +0100
 @@ -377,17 +377,18 @@ my %params = (
      'EXCHANGE_PARAM_KDF_UKM' =>               "kdf-ukm",
  
@@ -133,6 +100,3 @@ index 8b2d430f17..a109e44521 100644
  
  # Asym cipher parameters
      'ASYM_CIPHER_PARAM_DIGEST' =>                   '*PKEY_PARAM_DIGEST',
--- 
-2.38.1
-

SOURCES/0091-FIPS-RSA-encapsulate.patch

@@ -1,7 +1,19 @@
-diff -up openssl-3.0.1/providers/implementations/kem/rsa_kem.c.encap openssl-3.0.1/providers/implementations/kem/rsa_kem.c
---- openssl-3.0.1/providers/implementations/kem/rsa_kem.c.encap	2022-11-22 12:27:30.994530801 +0100
-+++ openssl-3.0.1/providers/implementations/kem/rsa_kem.c	2022-11-22 12:32:15.916875495 +0100
-@@ -264,6 +264,14 @@ static int rsasve_generate(PROV_RSA_CTX
+From afab56d09edb525dd794fcb2ae2295ab7f39400a Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 16:01:48 +0200
+Subject: [PATCH 42/48] 0091-FIPS-RSA-encapsulate.patch
+
+Patch-name: 0091-FIPS-RSA-encapsulate.patch
+Patch-id: 91
+---
+ providers/implementations/kem/rsa_kem.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c
+index 365ae3d7d6..8a6f585d0b 100644
+--- a/providers/implementations/kem/rsa_kem.c
++++ b/providers/implementations/kem/rsa_kem.c
+@@ -265,6 +265,14 @@ static int rsasve_generate(PROV_RSA_CTX *prsactx,
              *secretlen = nlen;
          return 1;
      }
@@ -16,7 +28,7 @@ diff -up openssl-3.0.1/providers/implementations/kem/rsa_kem.c.encap openssl-3.0
      /*
       * Step (2): Generate a random byte string z of nlen bytes where
       *            1 < z < n - 1
-@@ -307,6 +315,13 @@ static int rsasve_recover(PROV_RSA_CTX *
+@@ -308,6 +316,13 @@ static int rsasve_recover(PROV_RSA_CTX *prsactx,
          return 1;
      }
  
@@ -30,3 +42,6 @@ diff -up openssl-3.0.1/providers/implementations/kem/rsa_kem.c.encap openssl-3.0
      /* Step (2): check the input ciphertext 'inlen' matches the nlen */
      if (inlen != nlen) {
          ERR_raise(ERR_LIB_PROV, PROV_R_BAD_LENGTH);
+-- 
+2.41.0
+

SOURCES/0093-DH-Disable-FIPS-186-4-type-parameters-in-FIPS-mode.patch

@@ -1,25 +1,11 @@
-From 8a2d1b22ede5eeca4d104bb027b84f3ecfc69549 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Thu, 11 May 2023 12:51:59 +0200
-Subject: [PATCH] DH: Disable FIPS 186-4 type parameters in FIPS mode
+From 590babb35e3aa399c889282747965e301333a656 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 16:07:18 +0200
+Subject: [PATCH 43/48] 
+ 0093-DH-Disable-FIPS-186-4-type-parameters-in-FIPS-mode.patch
 
-For DH parameter and key pair generation/verification, the DSA
-procedures specified in FIPS 186-4 are used. With the release of FIPS
-186-5 and the removal of DSA, the approved status of these groups is in
-peril. Once the transition for DSA ends (this transition will be 1 year
-long and start once CMVP has published the guidance), no more
-submissions claiming DSA will be allowed. Hence, FIPS 186-type
-parameters will also be automatically non-approved.
-
-In the FIPS provider, disable validation of any DH parameters that are
-not well-known groups, and remove DH parameter generation completely.
-
-Adjust tests to use well-known groups or larger DH groups where this
-change would now cause failures, and skip tests that are expected to
-fail due to this change.
-
-Related: rhbz#2169757, rhbz#2169757
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0093-DH-Disable-FIPS-186-4-type-parameters-in-FIPS-mode.patch
+Patch-id: 93
 ---
  crypto/dh/dh_backend.c                       | 10 ++++
  crypto/dh/dh_check.c                         | 12 ++--
@@ -82,10 +68,10 @@ index 0b391910d6..75581ca347 100644
  #else
  int DH_check_params(const DH *dh, int *ret)
 diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c
-index aec6b85316..9c55121067 100644
+index 204662a81c..9961f21920 100644
 --- a/crypto/dh/dh_gen.c
 +++ b/crypto/dh/dh_gen.c
-@@ -38,18 +38,26 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
+@@ -39,18 +39,26 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
  int ossl_dh_generate_ffc_parameters(DH *dh, int type, int pbits, int qbits,
                                      BN_GENCB *cb)
  {
@@ -115,10 +101,10 @@ index aec6b85316..9c55121067 100644
          dh->dirty_cnt++;
      return ret;
 diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
-index 4e9705beef..14c0b0b6b3 100644
+index 83773cceea..7e988368d3 100644
 --- a/crypto/dh/dh_key.c
 +++ b/crypto/dh/dh_key.c
-@@ -308,8 +308,12 @@ static int generate_key(DH *dh)
+@@ -321,8 +321,12 @@ static int generate_key(DH *dh)
                  goto err;
          } else {
  #ifdef FIPS_MODULE
@@ -133,7 +119,7 @@ index 4e9705beef..14c0b0b6b3 100644
  #else
              if (dh->params.q == NULL) {
                  /* secret exponent length, must satisfy 2^(l-1) <= p */
-@@ -330,9 +334,7 @@ static int generate_key(DH *dh)
+@@ -343,9 +347,7 @@ static int generate_key(DH *dh)
                      if (!BN_clear_bit(priv_key, 0))
                          goto err;
                  }
@@ -144,7 +130,7 @@ index 4e9705beef..14c0b0b6b3 100644
                  /* Do a partial check for invalid p, q, g */
                  if (!ossl_ffc_params_simple_validate(dh->libctx, &dh->params,
                                                       FFC_PARAM_TYPE_DH, NULL))
-@@ -348,6 +350,7 @@ static int generate_key(DH *dh)
+@@ -361,6 +363,7 @@ static int generate_key(DH *dh)
                                                     priv_key))
                      goto err;
              }
@@ -194,10 +180,10 @@ index 9a7dde7c66..b3e7bca5ac 100644
          /*
           * Both of these functions check parameters. DH_check_params_ex()
 diff --git a/test/endecode_test.c b/test/endecode_test.c
-index e3f7b81f69..1b63daaed5 100644
+index 53385028fc..169f3ccd73 100644
 --- a/test/endecode_test.c
 +++ b/test/endecode_test.c
-@@ -80,10 +80,10 @@ static EVP_PKEY *make_template(const char *type, OSSL_PARAM *genparams)
+@@ -84,10 +84,10 @@ static EVP_PKEY *make_template(const char *type, OSSL_PARAM *genparams)
       * for testing only. Use a minimum key size of 2048 for security purposes.
       */
      if (strcmp(type, "DH") == 0)
@@ -211,10 +197,10 @@ index e3f7b81f69..1b63daaed5 100644
  
      /*
 diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c
-index 2448c35a14..92d484fb12 100644
+index a7913cda4c..96a35ac1cc 100644
 --- a/test/evp_libctx_test.c
 +++ b/test/evp_libctx_test.c
-@@ -188,7 +188,7 @@ static int do_dh_param_keygen(int tstid, const BIGNUM **bn)
+@@ -189,7 +189,7 @@ static int do_dh_param_keygen(int tstid, const BIGNUM **bn)
  
      if (!TEST_ptr(gen_ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey_parm, NULL))
          || !TEST_int_gt(EVP_PKEY_keygen_init(gen_ctx), 0)
@@ -309,7 +295,7 @@ index f0e8709062..2ff6d6e721 100644
  EVP_PKEY *get_dh2048(OSSL_LIB_CTX *libctx);
  EVP_PKEY *get_dh4096(OSSL_LIB_CTX *libctx);
 diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
-index cabbe3ecdf..efe56c5665 100644
+index 2a459856f0..afac836fa3 100644
 --- a/test/recipes/80-test_cms.t
 +++ b/test/recipes/80-test_cms.t
 @@ -627,10 +627,10 @@ my @smime_cms_param_tests = (
@@ -326,7 +312,7 @@ index cabbe3ecdf..efe56c5665 100644
        \&final_compare
      ]
 diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
-index 8c52b637fc..31ed54621b 100644
+index 527abcea6e..e1d38b1e62 100644
 --- a/test/recipes/80-test_ssl_old.t
 +++ b/test/recipes/80-test_ssl_old.t
 @@ -390,6 +390,9 @@ sub testssl {
@@ -340,5 +326,5 @@ index 8c52b637fc..31ed54621b 100644
                 'test sslv2/sslv3 with 1024bit DHE via BIO pair');
            }
 -- 
-2.40.1
+2.41.0
 

SOURCES/0110-GCM-Implement-explicit-FIPS-indicator-for-IV-gen.patch

@@ -1,28 +1,22 @@
-From 589eb3898896c1ac916bc20069ecd5adb8534850 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Fri, 17 Feb 2023 15:31:08 +0100
-Subject: [PATCH] GCM: Implement explicit FIPS indicator for IV gen
+From 5db03a4d024f1e396ff54d38ac70d9890b034074 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 16:10:11 +0200
+Subject: [PATCH 45/48] 
+ 0110-GCM-Implement-explicit-FIPS-indicator-for-IV-gen.patch
 
-Implementation Guidance for FIPS 140-3 and the Cryptographic Module
-Verification Program, Section C.H requires guarantees about the
-uniqueness of key/iv pairs, and proposes a few approaches to ensure
-this. Provide an indicator for option 2 "The IV may be generated
-internally at its entirety randomly."
-
-Resolves: rhbz#2168289
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0110-GCM-Implement-explicit-FIPS-indicator-for-IV-gen.patch
+Patch-id: 110
 ---
  include/openssl/evp.h                         |  4 +++
  .../implementations/ciphers/ciphercommon.c    |  4 +++
  .../ciphers/ciphercommon_gcm.c                | 25 +++++++++++++++++++
- util/perl/OpenSSL/paramnames.pm               |  5 ++--
- 4 files changed, 36 insertions(+), 2 deletions(-)
+ 4 files changed, 34 insertions(+)
 
 diff --git a/include/openssl/evp.h b/include/openssl/evp.h
-index 49e8e1df78..ec2ba46fbd 100644
+index 05f2d0f75a..f1a33ff6f2 100644
 --- a/include/openssl/evp.h
 +++ b/include/openssl/evp.h
-@@ -746,6 +746,10 @@ void EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags);
+@@ -748,6 +748,10 @@ void EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags);
  void EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags);
  int EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags);
  
@@ -52,7 +46,7 @@ diff --git a/providers/implementations/ciphers/ciphercommon_gcm.c b/providers/im
 index ed95c97ff4..db7910eb0e 100644
 --- a/providers/implementations/ciphers/ciphercommon_gcm.c
 +++ b/providers/implementations/ciphers/ciphercommon_gcm.c
-@@ -238,6 +238,31 @@ int ossl_gcm_get_ctx_params(void *vctx, OSSL_PARAM params[])
+@@ -224,6 +224,31 @@ int ossl_gcm_get_ctx_params(void *vctx, OSSL_PARAM params[])
              break;
          }
      }
@@ -84,10 +78,12 @@ index ed95c97ff4..db7910eb0e 100644
      return 1;
  }
  
-diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
-index a109e44521..64e9809387 100644
---- a/util/perl/OpenSSL/paramnames.pm
-+++ b/util/perl/OpenSSL/paramnames.pm
+-- 
+2.41.0
+
+diff -up openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.ivgen-patch openssl-3.2.0/util/perl/OpenSSL/paramnames.pm
+--- openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.ivgen-patch	2024-01-02 12:29:45.119433637 +0100
++++ openssl-3.2.0/util/perl/OpenSSL/paramnames.pm	2024-01-02 12:33:09.146723045 +0100
 @@ -101,8 +101,9 @@ my %params = (
      'CIPHER_PARAM_SPEED' =>                "speed",       # uint
      'CIPHER_PARAM_CTS_MODE' =>             "cts_mode",    # utf8_string
@@ -100,6 +96,3 @@ index a109e44521..64e9809387 100644
  
      'CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT' =>  "tls1multi_maxsndfrag",# uint
      'CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_BUFSIZE' =>        "tls1multi_maxbufsz",  # size_t
--- 
-2.39.1
-

SOURCES/0112-pbdkf2-Set-indicator-if-pkcs5-param-disabled-checks.patch

@@ -1,25 +1,20 @@
-From fa96a2f493276e7a57512e8c3d535052586f1525 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Mon, 6 Mar 2023 12:32:04 +0100
-Subject: [PATCH 2/2] pbdkf2: Set indicator if pkcs5 param disabled checks
+From 48c763ed9cc889806bc01222382ce6f918a408a2 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 16:12:33 +0200
+Subject: [PATCH 46/48] 
+ 0112-pbdkf2-Set-indicator-if-pkcs5-param-disabled-checks.patch
 
-The pbkdf2 implementation in the FIPS provider supports the checks
-required by NIST, but allows disabling these checks by setting the
-OSSL_KDF_PARAM_PKCS5 parameter to 1. The implementation must indicate
-that the use of this configuration is not approved in FIPS mode. Add an
-explicit indicator to provide this indication.
-
-Resolves: rhbz#2175145
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0112-pbdkf2-Set-indicator-if-pkcs5-param-disabled-checks.patch
+Patch-id: 112
 ---
  providers/implementations/kdfs/pbkdf2.c | 40 +++++++++++++++++++++++--
  1 file changed, 37 insertions(+), 3 deletions(-)
 
 diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c
-index aa0adce5e6..6df8c6d321 100644
+index 11820d1e69..bae2238ab5 100644
 --- a/providers/implementations/kdfs/pbkdf2.c
 +++ b/providers/implementations/kdfs/pbkdf2.c
-@@ -251,11 +251,42 @@ static const OSSL_PARAM *kdf_pbkdf2_settable_ctx_params(ossl_unused void *ctx,
+@@ -284,11 +284,42 @@ static const OSSL_PARAM *kdf_pbkdf2_settable_ctx_params(ossl_unused void *ctx,
  
  static int kdf_pbkdf2_get_ctx_params(void *vctx, OSSL_PARAM params[])
  {
@@ -65,7 +60,7 @@ index aa0adce5e6..6df8c6d321 100644
  }
  
  static const OSSL_PARAM *kdf_pbkdf2_gettable_ctx_params(ossl_unused void *ctx,
-@@ -263,6 +294,9 @@ static const OSSL_PARAM *kdf_pbkdf2_gettable_ctx_params(ossl_unused void *ctx,
+@@ -296,6 +327,9 @@ static const OSSL_PARAM *kdf_pbkdf2_gettable_ctx_params(ossl_unused void *ctx,
  {
      static const OSSL_PARAM known_gettable_ctx_params[] = {
          OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
@@ -76,5 +71,5 @@ index aa0adce5e6..6df8c6d321 100644
      };
      return known_gettable_ctx_params;
 -- 
-2.39.2
+2.41.0
 

SOURCES/0113-asymciphers-kem-Add-explicit-FIPS-indicator.patch

@@ -1,37 +1,22 @@
-From ee6e381e4140efd5365ddf27a12055859103cf59 Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cllang@redhat.com>
-Date: Fri, 17 Mar 2023 15:39:15 +0100
-Subject: [PATCH] asymciphers, kem: Add explicit FIPS indicator
+From 136988155862ce2b45683ef8045e7a8cdd11e215 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <dbelyavs@redhat.com>
+Date: Mon, 21 Aug 2023 16:13:46 +0200
+Subject: [PATCH 47/48] 0113-asymciphers-kem-Add-explicit-FIPS-indicator.patch
 
-NIST SP 800-56Br2 section 6.4.2.1 requires either explicit key
-confirmation (section 6.4.2.3.2), or assurance from a trusted third
-party (section 6.4.2.3.1) for the KTS-OAEP key transport scheme and key
-agreement schemes, but explicit key confirmation is not implemented and
-cannot be implemented without protocol changes, and the FIPS provider
-does not implement trusted third party validation, since it relies on
-its callers to do that. A request for guidance sent to NIST did clarify
-that OpenSSL can claim KTS-OAEP and RSASVE as approved, but we did add
-an indicator to mark them as unapproved previously and should thus keep
-the indicator available.
-
-This does not affect RSA-OAEP decryption, because it is approved as
-a component according to the FIPS 140-3 IG, section 2.4.G.
-
-Resolves: rhbz#2179331
-Resolves: RHEL-14083
-Signed-off-by: Clemens Lang <cllang@redhat.com>
+Patch-name: 0113-asymciphers-kem-Add-explicit-FIPS-indicator.patch
+Patch-id: 113
 ---
+ include/openssl/core_names.h                  |  2 ++
  include/openssl/evp.h                         |  4 +++
  .../implementations/asymciphers/rsa_enc.c     | 22 ++++++++++++++
  providers/implementations/kem/rsa_kem.c       | 30 ++++++++++++++++++-
- util/perl/OpenSSL/paramnames.pm               |  6 ++--
- 4 files changed, 59 insertions(+), 3 deletions(-)
+ 4 files changed, 57 insertions(+), 1 deletion(-)
 
 diff --git a/include/openssl/evp.h b/include/openssl/evp.h
-index ec2ba46fbd..3803b03422 100644
+index f1a33ff6f2..dadbf46a5a 100644
 --- a/include/openssl/evp.h
 +++ b/include/openssl/evp.h
-@@ -1764,6 +1764,10 @@ OSSL_DEPRECATEDIN_3_0 size_t EVP_PKEY_meth_get_count(void);
+@@ -1767,6 +1767,10 @@ OSSL_DEPRECATEDIN_3_0 size_t EVP_PKEY_meth_get_count(void);
  OSSL_DEPRECATEDIN_3_0 const EVP_PKEY_METHOD *EVP_PKEY_meth_get0(size_t idx);
  # endif
  
@@ -43,10 +28,10 @@ index ec2ba46fbd..3803b03422 100644
                                 const char *properties);
  int EVP_KEYMGMT_up_ref(EVP_KEYMGMT *keymgmt);
 diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c
-index 568452ec56..2e7ea632d7 100644
+index d169bfd396..bd4dcb4e27 100644
 --- a/providers/implementations/asymciphers/rsa_enc.c
 +++ b/providers/implementations/asymciphers/rsa_enc.c
-@@ -462,6 +462,27 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
+@@ -466,6 +466,27 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
      if (p != NULL && !OSSL_PARAM_set_uint(p, prsactx->implicit_rejection))
          return 0;
  
@@ -74,7 +59,7 @@ index 568452ec56..2e7ea632d7 100644
      return 1;
  }
  
-@@ -465,6 +483,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
+@@ -480,6 +501,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
      OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_TLS_NEGOTIATED_VERSION, NULL),
  #ifdef FIPS_MODULE
      OSSL_PARAM_octet_string(OSSL_ASYM_CIPHER_PARAM_REDHAT_KAT_OEAP_SEED, NULL, 0),
@@ -83,10 +68,10 @@ index 568452ec56..2e7ea632d7 100644
      OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION, NULL),
      OSSL_PARAM_END
 diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c
-index 882cf16125..b4cc0f9237 100644
+index 8a6f585d0b..f4b7415074 100644
 --- a/providers/implementations/kem/rsa_kem.c
 +++ b/providers/implementations/kem/rsa_kem.c
-@@ -151,11 +151,39 @@ static int rsakem_decapsulate_init(void *vprsactx, void *vrsa,
+@@ -152,11 +152,39 @@ static int rsakem_decapsulate_init(void *vprsactx, void *vrsa,
  static int rsakem_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
  {
      PROV_RSA_CTX *ctx = (PROV_RSA_CTX *)vprsactx;
@@ -127,10 +112,12 @@ index 882cf16125..b4cc0f9237 100644
      OSSL_PARAM_END
  };
  
-diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
-index 64e9809387..45ab0c8dc4 100644
---- a/util/perl/OpenSSL/paramnames.pm
-+++ b/util/perl/OpenSSL/paramnames.pm
+-- 
+2.41.0
+
+diff -up openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.kem-patch openssl-3.2.0/util/perl/OpenSSL/paramnames.pm
+--- openssl-3.2.0/util/perl/OpenSSL/paramnames.pm.kem-patch	2024-01-02 12:49:04.598756268 +0100
++++ openssl-3.2.0/util/perl/OpenSSL/paramnames.pm	2024-01-02 12:53:16.466464414 +0100
 @@ -406,6 +406,7 @@ my %params = (
      'ASYM_CIPHER_PARAM_TLS_NEGOTIATED_VERSION' =>   "tls-negotiated-version",
      'ASYM_CIPHER_PARAM_IMPLICIT_REJECTION' =>       "implicit-rejection",
@@ -151,6 +138,3 @@ index 64e9809387..45ab0c8dc4 100644
  
  # Capabilities
  
--- 
-2.39.2
-

SOURCES/0115-skip-quic-pairwise.patch

@@ -1,17 +1,17 @@
-From ec8e4e25cc5e5c67313c5fd6af94fa248685c3d1 Mon Sep 17 00:00:00 2001
+From 42ed594a3a905830374fb65cced431748f8c639c Mon Sep 17 00:00:00 2001
 From: Dmitry Belyavskiy <dbelyavs@redhat.com>
-Date: Thu, 7 Mar 2024 17:37:09 +0100
-Subject: [PATCH 45/49] 0115-skip-quic-pairwise.patch
+Date: Thu, 4 Apr 2024 11:50:58 +0200
+Subject: [PATCH 45/50] 0115-skip-quic-pairwise.patch
 
 Patch-name: 0115-skip-quic-pairwise.patch
 Patch-id: 115
 Patch-status: |
-    # skip quic and pairwise tests temporarily
+    # Amend tests according to Fedora/RHEL code
 ---
  test/quicapitest.c                     |  4 +++-
  test/recipes/01-test_symbol_presence.t |  1 +
- test/recipes/30-test_pairwise_fail.t   | 10 ++++++++--
- 3 files changed, 12 insertions(+), 3 deletions(-)
+ test/recipes/30-test_pairwise_fail.t   | 13 +++++++++++--
+ 3 files changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/test/quicapitest.c b/test/quicapitest.c
 index 41cf0fc7a8..0fb7492700 100644
@@ -29,7 +29,7 @@ index 41cf0fc7a8..0fb7492700 100644
      ADD_TEST(test_quic_forbidden_apis_ctx);
      ADD_TEST(test_quic_forbidden_apis);
 diff --git a/test/recipes/30-test_pairwise_fail.t b/test/recipes/30-test_pairwise_fail.t
-index c837d48fb4..6291c08c49 100644
+index c837d48fb4..f06ef04b1a 100644
 --- a/test/recipes/30-test_pairwise_fail.t
 +++ b/test/recipes/30-test_pairwise_fail.t
 @@ -9,7 +9,7 @@
@@ -41,7 +41,7 @@ index c837d48fb4..6291c08c49 100644
  use OpenSSL::Test::Utils;
  
  BEGIN {
-@@ -31,28 +31,37 @@ run(test(["fips_version_test", "-config"
+@@ -31,28 +31,37 @@ run(test(["fips_version_test", "-config", $provconf, ">=3.1.0"]),
  SKIP: {
      skip "Skip RSA test because of no rsa in this build", 1
          if disabled("rsa");

SOURCES/0125-PBMAC1-PKCS12-FIPS-default.patch

@@ -0,0 +1,21 @@
+diff -up openssl-3.2.2/apps/pkcs12.c.xxx openssl-3.2.2/apps/pkcs12.c
+--- openssl-3.2.2/apps/pkcs12.c.xxx	2024-08-14 11:24:41.164589397 +0200
++++ openssl-3.2.2/apps/pkcs12.c	2024-08-14 11:28:21.071004221 +0200
+@@ -17,6 +17,7 @@
+ #include <openssl/asn1.h>
+ #include <openssl/crypto.h>
+ #include <openssl/err.h>
++#include <openssl/evp.h>
+ #include <openssl/pem.h>
+ #include <openssl/pkcs12.h>
+ #include <openssl/provider.h>
+@@ -708,6 +709,9 @@ int pkcs12_main(int argc, char **argv)
+         }
+ 
+         if (maciter != -1) {
++            if (EVP_default_properties_is_fips_enabled(NULL))
++                pbmac1_pbkdf2 = 1;
++
+             if (pbmac1_pbkdf2 == 1) {
+                 if (!PKCS12_set_pbmac1_pbkdf2(p12, mpass, -1, NULL,
+                                               macsaltlen, maciter,

SOURCES/0127-speedup-SSL_add_cert_subjects_to_stack.patch

@@ -0,0 +1,201 @@
+From e2e469593a15681983d16e36d856bf8fb7de8589 Mon Sep 17 00:00:00 2001
+From: Clemens Lang <cllang@redhat.com>
+Date: Wed, 31 Jul 2024 12:45:11 +0200
+Subject: [PATCH] Speed up SSL_add_{file,dir}_cert_subjects_to_stack
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The X509_NAME comparison function converts its arguments to DER using
+i2d_X509_NAME before comparing the results using memcmp(). For every
+invocation of the comparison function (of which there are many when
+loading many certificates), it allocates two buffers of the appropriate
+size for the DER encoding.
+
+Switching to static buffers (possibly of X509_NAME_MAX size as defined
+in crypto/x509/x_name.c) would not work with multithreaded use, e.g.,
+when two threads sort two separate STACK_OF(X509_NAME)s at the same
+time. A suitable re-usable buffer could have been added to the
+STACK_OF(X509_NAME) if sk_X509_NAME_compfunc did have a void* argument,
+or a pointer to the STACK_OF(X509_NAME) – but it does not.
+
+Instead, copy the solution chosen in SSL_load_client_CA_file() by
+filling an LHASH_OF(X509_NAME) with all existing names in the stack and
+using that to deduplicate, rather than relying on sk_X509_NAME_find(),
+which ends up being very slow.
+
+Adjust SSL_add_dir_cert_subjects_to_stack() to keep a local
+LHASH_OF(X509_NAME)s over the complete directory it is processing.
+
+In a small benchmark that calls SSL_add_dir_cert_subjects_to_stack()
+twice, once on a directory with one entry, and once with a directory
+with 1000 certificates, and repeats this in a loop 10 times, this change
+yields a speed-up of 5.32:
+
+| Benchmark 1: ./bench 10 dir-1 dir-1000
+|   Time (mean ± σ):      6.685 s ±  0.017 s    [User: 6.402 s, System: 0.231 s]
+|   Range (min … max):    6.658 s …  6.711 s    10 runs
+|
+| Benchmark 2: LD_LIBRARY_PATH=. ./bench 10 dir-1 dir-1000
+|   Time (mean ± σ):      1.256 s ±  0.013 s    [User: 1.034 s, System: 0.212 s]
+|   Range (min … max):    1.244 s …  1.286 s    10 runs
+|
+| Summary
+|   LD_LIBRARY_PATH=. ./bench 10 dir-1 dir-1000 ran
+|    5.32 ± 0.06 times faster than ./bench 10 dir-1 dir-1000
+
+In the worst case scenario where many entries are added to a stack that
+is then repeatedly used to add more certificates, and with a larger test
+size, the speedup is still very significant. With 15000 certificates,
+a single pass to load them, followed by attempting to load a subset of
+1000 of these 15000 certificates, followed by a single certificate, the
+new approach is ~85 times faster:
+
+| Benchmark 1: ./bench 1 dir-15000 dir-1000 dir-1
+|   Time (mean ± σ):     176.295 s ±  4.147 s    [User: 174.593 s, System: 0.448 s]
+|   Range (min … max):   173.774 s … 185.594 s    10 runs
+|
+| Benchmark 2: LD_LIBRARY_PATH=. ./bench 1 dir-15000 dir-1000 dir-1
+|   Time (mean ± σ):      2.087 s ±  0.034 s    [User: 1.679 s, System: 0.393 s]
+|   Range (min … max):    2.057 s …  2.167 s    10 runs
+|
+| Summary
+|   LD_LIBRARY_PATH=. ./bench 1 dir-15000 dir-1000 dir-1 ran
+|    84.48 ± 2.42 times faster than ./bench 1 dir-15000 dir-1000 dir-1
+
+Signed-off-by: Clemens Lang <cllang@redhat.com>
+---
+ ssl/ssl_cert.c | 74 ++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 65 insertions(+), 9 deletions(-)
+
+diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
+index 0ff407bf55edc..5e5ffe39d0655 100644
+--- a/ssl/ssl_cert.c
++++ b/ssl/ssl_cert.c
+@@ -813,16 +813,14 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
+     return SSL_load_client_CA_file_ex(file, NULL, NULL);
+ }
+ 
+-int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
+-                                        const char *file)
++static int add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
++                                           const char *file,
++                                           LHASH_OF(X509_NAME) *name_hash)
+ {
+     BIO *in;
+     X509 *x = NULL;
+     X509_NAME *xn = NULL;
+     int ret = 1;
+-    int (*oldcmp) (const X509_NAME *const *a, const X509_NAME *const *b);
+-
+-    oldcmp = sk_X509_NAME_set_cmp_func(stack, xname_sk_cmp);
+ 
+     in = BIO_new(BIO_s_file());
+ 
+@@ -842,12 +840,15 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
+         xn = X509_NAME_dup(xn);
+         if (xn == NULL)
+             goto err;
+-        if (sk_X509_NAME_find(stack, xn) >= 0) {
++        if (lh_X509_NAME_retrieve(name_hash, xn) != NULL) {
+             /* Duplicate. */
+             X509_NAME_free(xn);
+         } else if (!sk_X509_NAME_push(stack, xn)) {
+             X509_NAME_free(xn);
+             goto err;
++        } else {
++            /* Successful insert, add to hash table */
++            lh_X509_NAME_insert(name_hash, xn);
+         }
+     }
+ 
+@@ -859,7 +860,42 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
+  done:
+     BIO_free(in);
+     X509_free(x);
+-    (void)sk_X509_NAME_set_cmp_func(stack, oldcmp);
++    return ret;
++}
++
++int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
++                                        const char *file)
++{
++    X509_NAME *xn = NULL;
++    int ret = 1;
++    int idx = 0;
++    int num = 0;
++    LHASH_OF(X509_NAME) *name_hash = lh_X509_NAME_new(xname_hash, xname_cmp);
++
++    if (name_hash == NULL) {
++        ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
++        goto err;
++    }
++
++    /*
++     * Pre-populate the lhash with the existing entries of the stack, since
++     * using the LHASH_OF is much faster for duplicate checking. That's because
++     * xname_cmp converts the X509_NAMEs to DER involving a memory allocation
++     * for every single invocation of the comparison function.
++     */
++    num = sk_X509_NAME_num(stack);
++    for (idx = 0; idx < num; idx++) {
++        xn = sk_X509_NAME_value(stack, idx);
++        lh_X509_NAME_insert(name_hash, xn);
++    }
++
++    ret = add_file_cert_subjects_to_stack(stack, file, name_hash);
++    goto done;
++
++ err:
++    ret = 0;
++ done:
++    lh_X509_NAME_free(name_hash);
+     return ret;
+ }
+ 
+@@ -869,8 +905,27 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
+     OPENSSL_DIR_CTX *d = NULL;
+     const char *filename;
+     int ret = 0;
++    X509_NAME *xn = NULL;
++    int idx = 0;
++    int num = 0;
++    LHASH_OF(X509_NAME) *name_hash = lh_X509_NAME_new(xname_hash, xname_cmp);
++
++    if (name_hash == NULL) {
++        ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
++        goto err;
++    }
+ 
+-    /* Note that a side effect is that the CAs will be sorted by name */
++    /*
++     * Pre-populate the lhash with the existing entries of the stack, since
++     * using the LHASH_OF is much faster for duplicate checking. That's because
++     * xname_cmp converts the X509_NAMEs to DER involving a memory allocation
++     * for every single invocation of the comparison function.
++     */
++    num = sk_X509_NAME_num(stack);
++    for (idx = 0; idx < num; idx++) {
++        xn = sk_X509_NAME_value(stack, idx);
++        lh_X509_NAME_insert(name_hash, xn);
++    }
+ 
+     while ((filename = OPENSSL_DIR_read(&d, dir))) {
+         char buf[1024];
+@@ -899,7 +954,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
+ #endif
+         if (r <= 0 || r >= (int)sizeof(buf))
+             goto err;
+-        if (!SSL_add_file_cert_subjects_to_stack(stack, buf))
++        if (!add_file_cert_subjects_to_stack(stack, buf, name_hash))
+             goto err;
+     }
+ 
+@@ -915,6 +970,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
+  err:
+     if (d)
+         OPENSSL_DIR_end(&d);
++    lh_X509_NAME_free(name_hash);
+ 
+     return ret;
+ }

SOURCES/0128-SAST-findings.patch

@@ -0,0 +1,24 @@
+diff -up openssl-3.2.2/crypto/rsa/rsa_oaep.c.xxx openssl-3.2.2/crypto/rsa/rsa_oaep.c
+--- openssl-3.2.2/crypto/rsa/rsa_oaep.c.xxx	2024-08-14 14:22:48.733407808 +0200
++++ openssl-3.2.2/crypto/rsa/rsa_oaep.c	2024-08-14 14:23:32.994483135 +0200
+@@ -233,7 +233,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(un
+ 
+     mdlen = EVP_MD_get_size(md);
+ 
+-    if (tlen <= 0 || flen <= 0)
++    if (tlen <= 0 || flen <= 0 || mdlen <= 0)
+         return -1;
+     /*
+      * |num| is the length of the modulus; |flen| is the length of the
+diff -up openssl-3.2.2/crypto/x509/pcy_tree.c.xxx openssl-3.2.2/crypto/x509/pcy_tree.c
+--- openssl-3.2.2/crypto/x509/pcy_tree.c.xxx	2024-08-14 14:14:13.144850097 +0200
++++ openssl-3.2.2/crypto/x509/pcy_tree.c	2024-08-14 14:14:53.213826481 +0200
+@@ -110,6 +110,8 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
+ 
+     *ptree = NULL;
+ 
++    if (n < 0)
++        return X509_PCY_TREE_INTERNAL;
+     /* Can't do anything with just a trust anchor */
+     if (n == 0)
+         return X509_PCY_TREE_EMPTY;

SOURCES/openssl.rpmlintrc

@@ -0,0 +1,9 @@
+# capi.so is a dummy only used on Windows, it doesn't need dependency information
+addFilter("E: shared-lib(rary)?-without-dependency-information /usr/lib64/engines-3/capi.so")
+
+# The sources are hobbled and thus not a valid URL. That's expected.
+addFilter("W: invalid-url Source0: openssl-[0-9\\.]+-hobbled.tar.gz")
+
+# Technically this warning is correct, but in the case of the openssl binary we
+# want to allow SSL_CTX_set_cipher_list
+addFilter("W: crypto-policy-non-compliance-openssl /usr/bin/openssl SSL_CTX_set_cipher_list")