public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/tpm2-tss] rawhide: OpenSSL 4 build fixes
@ 2026-06-12 16:02 Simo Sorce
  0 siblings, 0 replies; only message in thread
From: Simo Sorce @ 2026-06-12 16:02 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/tpm2-tss
            Branch : rawhide
            Commit : 5f010b2bb872edb077debc66378d63d85eab64a9
            Author : Simo Sorce <simo@redhat.com>
            Date   : 2026-06-12T15:49:33+00:00
            Stats  : +58/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/tpm2-tss/c/5f010b2bb872edb077debc66378d63d85eab64a9?branch=rawhide

            Log:
            OpenSSL 4 build fixes

Signed-off-by: Simo Sorce <simo@redhat.com>

---
diff --git a/0001-Update-OpenSSL-API-compatibility.patch b/0001-Update-OpenSSL-API-compatibility.patch
new file mode 100644
index 0000000..0c570ee
--- /dev/null
+++ b/0001-Update-OpenSSL-API-compatibility.patch
@@ -0,0 +1,52 @@
+From 69ed2fc42fead70dca5b2dd68f406b0d8171e127 Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Fri, 17 Apr 2026 14:34:32 -0400
+Subject: [PATCH] Update OpenSSL API compatibility
+
+Replace direct access to ASN1_STRING data members with the
+ASN1_STRING_get0_data() accessor function, as modern OpenSSL versions use
+opaque structures. Additionally, add const qualifiers to X509_NAME pointers to
+ensure const-correctness with newer OpenSSL APIs.
+
+Co-authored-by: Gemini <gemini@google.com>
+Signed-off-by: Simo Sorce <simo@redhat.com>
+---
+ src/tss2-fapi/ifapi_curl.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/tss2-fapi/ifapi_curl.c b/src/tss2-fapi/ifapi_curl.c
+index 976f36d..09a9b0d 100644
+--- a/src/tss2-fapi/ifapi_curl.c
++++ b/src/tss2-fapi/ifapi_curl.c
+@@ -88,7 +88,7 @@ get_crl_from_cert(X509 *cert, X509_CRL **crl)
+                 GENERAL_NAME *gen_name = sk_GENERAL_NAME_value(distpoint->name.fullname, j);
+                 ASN1_IA5STRING *asn1_str = gen_name->d.uniformResourceIdentifier;
+                 SAFE_FREE(url);
+-                url = (unsigned char *)strdup((char *)asn1_str->data);
++                url = (unsigned char *)strdup((char *)ASN1_STRING_get0_data(asn1_str));
+                 goto_if_null2(url, "Out of memory", r, TSS2_FAPI_RC_MEMORY, cleanup);
+             }
+         }
+@@ -122,8 +122,8 @@ cleanup:
+ 
+ static bool
+ is_self_signed(X509 *cert) {
+-    X509_NAME *issuer = X509_get_issuer_name(cert);
+-    X509_NAME *subject = X509_get_subject_name(cert);
++    const X509_NAME *issuer = X509_get_issuer_name(cert);
++    const X509_NAME *subject = X509_get_subject_name(cert);
+ 
+     /* Compare the issuer and subject names */
+     if (X509_NAME_cmp(issuer, subject) == 0) {
+@@ -189,7 +189,7 @@ ifapi_curl_verify_ek_cert(
+                 continue;
+             }
+             uri = ad->location->d.uniformResourceIdentifier;
+-            url = uri->data;
++            url = (unsigned char *)ASN1_STRING_get0_data(uri);
+             curl_rc = ifapi_get_curl_buffer(url, &cert_buffer, &cert_buffer_size);
+             if (curl_rc != 0) {
+                 goto_error(r, TSS2_FAPI_RC_NO_CERT, "Get certificate.", cleanup);
+-- 
+2.53.0
+

diff --git a/tpm2-tss.spec b/tpm2-tss.spec
index 3e853c2..41365d0 100644
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -5,7 +5,7 @@
 
 Name:          tpm2-tss
 Version:       4.1.3
-Release:       9%{?candidate:.%{candidate}}%{?dist}
+Release:       10%{?candidate:.%{candidate}}%{?dist}
 Summary:       TPM2.0 Software Stack
 
 License:       BSD-2-Clause
@@ -16,6 +16,8 @@ Source1:       tpm2-tss-systemd-sysusers.conf
 Patch0:        tpm2-tss-3.0.0-doxygen.patch
 # Do not use <openssl/engine.h> (fixed upstream for 4.2)
 Patch1:        tpm2-tss-4.1.3-openssl-no-engine.patch
+# Openssl 4 build fixes
+Patch2:        0001-Update-OpenSSL-API-compatibility.patch
 
 %global udevrules_prefix 60-
 
@@ -152,6 +154,9 @@ use tpm2-tss.
 %{_mandir}/man7/tss2*.7.gz
 
 %changelog
+* Fri Apr 17 2026 Simo Sorce <ssorce@cwredhatfedoraproject.org> - 4.1.3-10
+- OpenSSL 4 build fixes
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-12 16:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-12 16:02 [rpms/tpm2-tss] rawhide: OpenSSL 4 build fixes Simo Sorce

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox