[rpms/openssl] rebase_40beta: Fixup for loading default cipher string

[rpms/openssl] rebase_40beta: Fixup for loading default cipher string

[Dmitry Belyavskiy]

            A new commit has been pushed.

            Repo   : rpms/openssl
            Branch : rebase_40beta
            Commit : 288f8cc577d8296666813dfe95e4e425b53be798
            Author : Dmitry Belyavskiy <dbelyavs@redhat.com>
            Date   : 2025-01-29T21:31:10+01:00
            Stats  : +7/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/openssl/c/288f8cc577d8296666813dfe95e4e425b53be798?branch=rebase_40beta

            Log:
            Fixup for loading default cipher string

Resolves: rhbz#2342801

---
diff --git a/0007-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch b/0007-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
index c9c7a4f..83d5c23 100644
--- a/0007-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
+++ b/0007-Add-support-for-PROFILE-SYSTEM-system-default-cipher.patch
@@ -139,7 +139,7 @@ index 8360991ce4..33c23efb0d 100644
 +
 +    if ((ciphers_path = secure_getenv("OPENSSL_SYSTEM_CIPHERS_OVERRIDE")) == NULL)
 +        ciphers_path = SYSTEM_CIPHERS_FILE;
-+
++    ERR_set_mark();
 +    if (access(ciphers_path, R_OK) == 0) {
 +        CONF *conf = NCONF_new_ex(NULL, NCONF_default());
 +        char *value = NULL;
@@ -153,7 +153,7 @@ index 8360991ce4..33c23efb0d 100644
 +    } else {
 +        snprintf(buf, sizeof(buf), "%s", SSL_DEFAULT_CIPHER_LIST);
 +    }
-+
++    ERR_pop_to_mark();
 +    slen = strlen(suffix);
 +    len = strlen(buf);
 +

diff --git a/openssl.spec b/openssl.spec
index 13cd9cb..3fab779 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -29,7 +29,7 @@ print(string.sub(hash, 0, 16))
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 3.2.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 Source: openssl-%{version}.tar.gz
 Source2: Makefile.certificate
@@ -557,6 +557,10 @@ ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysco
 %ldconfig_scriptlets libs
 
 %changelog
+* Wed Jan 29 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.2.2-14
+- Fixup for loading default cipher string
+  Resolves: rhbz#2342801
+
 * Mon Jan 27 2025 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.2.2-13
 - Locally configured providers should not interfere with openssl build-time tests
 - Load system default cipher string from crypto-policies configuration file