public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Peter Robinson <pbrobinson@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/tpm2-tss] rawhide: 4.2.0
Date: Wed, 15 Jul 2026 20:05:40 GMT	[thread overview]
Message-ID: <178414594055.1.1911169195393793724.rpms-tpm2-tss-c22cca7d1e33@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/tpm2-tss
Branch : rawhide
Commit : c22cca7d1e33732fdb8f6d60483042a3fb912ad8
Author : Peter Robinson <pbrobinson@gmail.com>
Date   : 2026-07-15T21:05:25+01:00
Stats  : +10/-121 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/tpm2-tss/c/c22cca7d1e33732fdb8f6d60483042a3fb912ad8?branch=rawhide

Log:
4.2.0

---
diff --git a/0001-Update-OpenSSL-API-compatibility.patch b/0001-Update-OpenSSL-API-compatibility.patch
deleted file mode 100644
index 0c570ee..0000000
--- a/0001-Update-OpenSSL-API-compatibility.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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/sources b/sources
index 7dee31f..c8c0c86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tpm2-tss-4.1.3.tar.gz) = c9a5e1e90f6545a466d43790ab2d67c52c4b788a0b21f8212575e27e04e0ac663105863fe00824e08a4e56a4f8c6b00c48c1a1c132531b8569cd5042c3bb9e69
+SHA512 (tpm2-tss-4.2.0.tar.gz) = d122cacd07f3fa229b4f9d988eb8cd4cf8e8021cf3cb32724c13cafa2a94091f1a0fe2bf3df327709e257c6a006277388923939525f33d84782efce7e5dc61c8

diff --git a/tpm2-tss-4.1.3-openssl-no-engine.patch b/tpm2-tss-4.1.3-openssl-no-engine.patch
deleted file mode 100644
index e357ac3..0000000
--- a/tpm2-tss-4.1.3-openssl-no-engine.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-No ENGINE_* APIs are used anymore.
-
-diff --git a/src/tss2-esys/esys_crypto_ossl.c b/src/tss2-esys/esys_crypto_ossl.c
-index 1620788..b990f6e 100644
---- a/src/tss2-esys/esys_crypto_ossl.c
-+++ b/src/tss2-esys/esys_crypto_ossl.c
-@@ -19,7 +19,6 @@
- #include <openssl/params.h>
- #include <openssl/param_build.h>
- #endif
--#include <openssl/engine.h>
- #include <stdio.h>
- 
- #include "tss2_esys.h"
-diff --git a/test/integration/fapi-data-crypt.int.c b/test/integration/fapi-data-crypt.int.c
-index 07437b6..cc0dfd6 100644
---- a/test/integration/fapi-data-crypt.int.c
-+++ b/test/integration/fapi-data-crypt.int.c
-@@ -15,7 +15,6 @@
- 
- #include <openssl/evp.h>
- #include <openssl/rsa.h>
--#include <openssl/engine.h>
- #include <openssl/pem.h>
- 
- #include "tss2_fapi.h"
-diff --git a/test/integration/fapi-ext-public-key.int.c b/test/integration/fapi-ext-public-key.int.c
-index 787a6c9..5d30d2c 100644
---- a/test/integration/fapi-ext-public-key.int.c
-+++ b/test/integration/fapi-ext-public-key.int.c
-@@ -11,7 +11,6 @@
- #include <openssl/evp.h>
- #include <openssl/aes.h>
- #include <openssl/rsa.h>
--#include <openssl/engine.h>
- #include <openssl/pem.h>
- #include <stdio.h>
- #include <stddef.h>
-diff --git a/test/integration/fapi-key-create-policy-signed-keyedhash.int.c b/test/integration/fapi-key-create-policy-signed-keyedhash.int.c
-index f9f4131..d65ea10 100644
---- a/test/integration/fapi-key-create-policy-signed-keyedhash.int.c
-+++ b/test/integration/fapi-key-create-policy-signed-keyedhash.int.c
-@@ -17,7 +17,6 @@
- 
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
--#include <openssl/engine.h>
- #include <openssl/pem.h>
- 
- #include "tss2_fapi.h"
-diff --git a/test/integration/fapi-key-create-policy-signed.int.c b/test/integration/fapi-key-create-policy-signed.int.c
-index d20554a..0eb848e 100644
---- a/test/integration/fapi-key-create-policy-signed.int.c
-+++ b/test/integration/fapi-key-create-policy-signed.int.c
-@@ -17,7 +17,6 @@
- 
- #include <openssl/evp.h>
- #include <openssl/rsa.h>
--#include <openssl/engine.h>
- #include <openssl/pem.h>
- 
- #include "tss2_fapi.h"

diff --git a/tpm2-tss.spec b/tpm2-tss.spec
index 41365d0..18b1711 100644
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -4,8 +4,8 @@
 %endif
 
 Name:          tpm2-tss
-Version:       4.1.3
-Release:       10%{?candidate:.%{candidate}}%{?dist}
+Version:       4.2.0
+Release:       1%{?candidate:.%{candidate}}%{?dist}
 Summary:       TPM2.0 Software Stack
 
 License:       BSD-2-Clause
@@ -14,10 +14,6 @@ Source0:       %{url}/releases/download/%{version}/%{name}-%{version}%{?candidat
 Source1:       tpm2-tss-systemd-sysusers.conf
 # doxygen crash
 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-
 
@@ -99,8 +95,10 @@ install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/tpm2-tss.conf
 %{_libdir}/libtss2-tcti-spi-helper.so.0*
 %{_libdir}/libtss2-tcti-spi-ltt2go.so.0*
 %{_libdir}/libtss2-tcti-swtpm.so.0*
+%{_libdir}/libtss2-tcti-null.so.0*
 %{_sysusersdir}/tpm2-tss.conf
 %{_udevrulesdir}/%{udevrules_prefix}tpm-udev.rules
+%{_udevrulesdir}/%{udevrules_prefix}ltt2go-udev.rules
 
 %files fapi
 %{_libdir}/libtss2-fapi.so.1*
@@ -133,6 +131,7 @@ use tpm2-tss.
 %{_libdir}/libtss2-tcti-spi-helper.so
 %{_libdir}/libtss2-tcti-spi-ltt2go.so
 %{_libdir}/libtss2-tcti-swtpm.so
+%{_libdir}/libtss2-tcti-null.so
 %{_libdir}/pkgconfig/tss2-mu.pc
 %{_libdir}/pkgconfig/tss2-sys.pc
 %{_libdir}/pkgconfig/tss2-esys.pc
@@ -149,11 +148,15 @@ use tpm2-tss.
 %{_libdir}/pkgconfig/tss2-tcti-spi-helper.pc
 %{_libdir}/pkgconfig/tss2-tcti-spi-ltt2go.pc
 %{_libdir}/pkgconfig/tss2-tcti-swtpm.pc
+%{_libdir}/pkgconfig/tss2-tcti-null.pc
 %{_mandir}/man3/*.3.gz
 %{_mandir}/man5/*.5.gz
 %{_mandir}/man7/tss2*.7.gz
 
 %changelog
+* Wed Jul 15 2026 Peter Robinson <pbrobinson@fedoraproject.org> - 4.2.0-1
+- Update to 4.2.0
+
 * Fri Apr 17 2026 Simo Sorce <ssorce@cwredhatfedoraproject.org> - 4.1.3-10
 - OpenSSL 4 build fixes
 

                 reply	other threads:[~2026-07-15 20:05 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178414594055.1.1911169195393793724.rpms-tpm2-tss-c22cca7d1e33@fedoraproject.org \
    --to=pbrobinson@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox