Resolve SAST package scan results

Resolves: RHEL-37561

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

@@ -1,30 +1,29 @@
-From 66b728801f141c9db8e647ab02421c83694ade79 Mon Sep 17 00:00:00 2001
+From 8be4ef77c64fcada41041c00e02c34b07658ba66 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
-Date: Mon, 31 Jul 2023 09:41:27 +0200
+Date: Wed, 6 Mar 2024 19:17:14 +0100
-Subject: [PATCH 07/35] 
+Subject: [PATCH 07/49] 
  0007-Add-support-for-PROFILE-SYSTEM-system-default-cipher.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
+    # # Add support for PROFILE=SYSTEM system default cipherlist
-From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
+From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
 ---
  Configurations/unix-Makefile.tmpl |  5 ++
  Configure                         | 11 +++-
  doc/man1/openssl-ciphers.pod.in   |  9 ++++
  include/openssl/ssl.h.in          |  5 ++
- ssl/ssl_ciph.c                    | 87 +++++++++++++++++++++++++++----
+ ssl/ssl_ciph.c                    | 86 +++++++++++++++++++++++++++----
  ssl/ssl_lib.c                     |  4 +-
  test/cipherlist_test.c            |  2 +
- util/libcrypto.num                |  1 +
+ 7 files changed, 109 insertions(+), 13 deletions(-)
- 8 files changed, 110 insertions(+), 14 deletions(-)
 
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index f29cdc7f38..c0df026de3 100644
+index 5d61ce9550..e9fba957f1 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -315,6 +315,10 @@ MANDIR=$(INSTALLTOP)/share/man
+@@ -324,6 +324,10 @@ MANDIR=$(INSTALLTOP)/share/man
  DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
  HTMLDIR=$(DOCDIR)/html
  
@@ -35,7 +34,7 @@ index f29cdc7f38..c0df026de3 100644
  # MANSUFFIX is for the benefit of anyone who may want to have a suffix
  # appended after the manpage file section number.  "ssl" is popular,
  # resulting in files such as config.5ssl rather than config.5.
-@@ -338,6 +342,7 @@ CC=$(CROSS_COMPILE){- $config{CC} -}
+@@ -347,6 +351,7 @@ CC=$(CROSS_COMPILE){- $config{CC} -}
  CXX={- $config{CXX} ? "\$(CROSS_COMPILE)$config{CXX}" : '' -}
  CPPFLAGS={- our $cppflags1 = join(" ",
                                    (map { "-D".$_} @{$config{CPPDEFINES}}),
@@ -44,7 +43,7 @@ index f29cdc7f38..c0df026de3 100644
                                    @{$config{CPPFLAGS}}) -}
  CFLAGS={- join(' ', @{$config{CFLAGS}}) -}
 diff --git a/Configure b/Configure
-index 456995240b..93be83be94 100755
+index cca1ac8d16..2ae1cd0bc2 100755
 --- a/Configure
 +++ b/Configure
 @@ -27,7 +27,7 @@ use OpenSSL::config;
@@ -67,7 +66,7 @@ index 456995240b..93be83be94 100755
  # --banner=".." Output specified text instead of default completion banner
  #
  # -w            Don't wait after showing a Configure warning
-@@ -387,6 +391,7 @@ $config{prefix}="";
+@@ -394,6 +398,7 @@ $config{prefix}="";
  $config{openssldir}="";
  $config{processor}="";
  $config{libdir}="";
@@ -75,7 +74,7 @@ index 456995240b..93be83be94 100755
  my $auto_threads=1;    # enable threads automatically? true by default
  my $default_ranlib;
  
-@@ -989,6 +994,10 @@ while (@argvcopy)
+@@ -1047,6 +1052,10 @@ while (@argvcopy)
                          die "FIPS key too long (64 bytes max)\n"
                             if length $1 > 64;
                          }
@@ -87,10 +86,10 @@ index 456995240b..93be83be94 100755
                          {
                          $banner = $1 . "\n";
 diff --git a/doc/man1/openssl-ciphers.pod.in b/doc/man1/openssl-ciphers.pod.in
-index 658730ec53..04e66bcebe 100644
+index d4df30686f..cec4835268 100644
 --- a/doc/man1/openssl-ciphers.pod.in
 +++ b/doc/man1/openssl-ciphers.pod.in
-@@ -186,6 +186,15 @@ As of OpenSSL 1.0.0, the B<ALL> cipher suites are sensibly ordered by default.
+@@ -190,6 +190,15 @@ As of OpenSSL 1.0.0, the B<ALL> cipher suites are sensibly ordered by default.
  
  The cipher suites not enabled by B<ALL>, currently B<eNULL>.
  
@@ -107,10 +106,10 @@ index 658730ec53..04e66bcebe 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 f03f52fbd8..0b6de603e2 100644
+index 9f91039f8a..fc34d4ca61 100644
 --- a/include/openssl/ssl.h.in
 +++ b/include/openssl/ssl.h.in
-@@ -208,6 +208,11 @@ extern "C" {
+@@ -209,6 +209,11 @@ extern "C" {
   * throwing out anonymous and unencrypted ciphersuites! (The latter are not
   * actually enabled by ALL, but "ALL:RSA" would enable some of them.)
   */
@@ -123,10 +122,10 @@ index f03f52fbd8..0b6de603e2 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 93de9cf8fd..a5e60e8839 100644
+index 8360991ce4..33c23efb0d 100644
 --- a/ssl/ssl_ciph.c
 +++ b/ssl/ssl_ciph.c
-@@ -1443,6 +1443,53 @@ int SSL_set_ciphersuites(SSL *s, const char *str)
+@@ -1455,6 +1455,53 @@ int SSL_set_ciphersuites(SSL *s, const char *str)
      return ret;
  }
  
@@ -180,7 +179,7 @@ index 93de9cf8fd..a5e60e8839 100644
  STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
                                               STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
                                               STACK_OF(SSL_CIPHER) **cipher_list,
-@@ -1457,15 +1504,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;
@@ -208,7 +207,16 @@ index 93de9cf8fd..a5e60e8839 100644
  
      /*
       * To reduce the work to do we only want to process the compiled
-@@ -1553,8 +1610,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+@@ -1499,7 +1556,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
+     if (num_of_ciphers > 0) {
+         co_list = OPENSSL_malloc(sizeof(*co_list) * num_of_ciphers);
+         if (co_list == NULL)
+-            return NULL;          /* Failure */
++            goto err;
+     }
+ 
+     ssl_cipher_collect_ciphers(ssl_method, num_of_ciphers,
+@@ -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)) {
@@ -218,7 +226,17 @@ index 93de9cf8fd..a5e60e8839 100644
      }
  
      /*
-@@ -1626,8 +1681,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);
+-        return NULL;          /* Failure */
++        goto err;
+     }
+     ssl_cipher_collect_aliases(ca_list, num_of_group_aliases,
+                                disabled_mkey, disabled_auth, disabled_enc,
+@@ -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 */
@@ -228,7 +246,7 @@ index 93de9cf8fd..a5e60e8839 100644
      }
  
      /*
-@@ -1635,10 +1689,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) {
@@ -244,7 +262,7 @@ index 93de9cf8fd..a5e60e8839 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);
-@@ -1690,6 +1747,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;
@@ -260,10 +278,10 @@ index 93de9cf8fd..a5e60e8839 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 f12ad6d034..a059bcd83b 100644
+index cf59d2dfa5..1329841aaf 100644
 --- a/ssl/ssl_lib.c
 +++ b/ssl/ssl_lib.c
-@@ -661,7 +661,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),
@@ -272,7 +290,7 @@ index f12ad6d034..a059bcd83b 100644
      if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0)) {
          ERR_raise(ERR_LIB_SSL, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS);
          return 0;
-@@ -3286,7 +3286,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,
@@ -282,10 +300,10 @@ index f12ad6d034..a059bcd83b 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 2d166e2b46..4ff2aa12d6 100644
+index c46e431b00..19d05e860b 100644
 --- a/test/cipherlist_test.c
 +++ b/test/cipherlist_test.c
-@@ -246,7 +246,9 @@ end:
+@@ -261,7 +261,9 @@ end:
  
  int setup_tests(void)
  {
@@ -296,26 +314,5 @@ index 2d166e2b46..4ff2aa12d6 100644
      ADD_TEST(test_default_cipherlist_clear);
      ADD_TEST(test_stdname_cipherlist);
 -- 
-2.41.0
+2.44.0
 
-diff -up openssl-3.2.0/ssl/ssl_ciph.c.7patch openssl-3.2.0/ssl/ssl_ciph.c
---- openssl-3.2.0/ssl/ssl_ciph.c.7patch	2023-11-30 13:43:03.510620566 +0100
-+++ openssl-3.2.0/ssl/ssl_ciph.c	2023-11-30 13:44:21.275313230 +0100
-@@ -1556,7 +1556,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
-     if (num_of_ciphers > 0) {
-         co_list = OPENSSL_malloc(sizeof(*co_list) * num_of_ciphers);
-         if (co_list == NULL)
--            return NULL;          /* Failure */
-+            goto err;
-     }
- 
-     ssl_cipher_collect_ciphers(ssl_method, num_of_ciphers,
-@@ -1667,7 +1667,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
-     ca_list = OPENSSL_malloc(sizeof(*ca_list) * num_of_alias_max);
-     if (ca_list == NULL) {
-         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,

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;

openssl.spec

@@ -168,6 +168,7 @@ Patch125: 0125-PBMAC1-PKCS12-FIPS-default.patch
 Patch126: 0126-pkeyutl-encap.patch
 # https://github.com/openssl/openssl/issues/25056
 Patch127: 0127-speedup-SSL_add_cert_subjects_to_stack.patch
+Patch128: 0128-SAST-findings.patch
 
 License: Apache-2.0
 URL: http://www.openssl.org/
@@ -524,6 +525,8 @@ ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysco
   Related: RHEL-47335
 - Speedup SSL_add_{file,dir}_cert_subjects_to_stack
   Resolves: RHEL-54232
+- Resolve SAST package scan results
+  Resolves: RHEL-37561
 
 * Fri Aug 09 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.2.2-9
 - An interface to create PKCS #12 files in FIPS compliant way