]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Update pkcs11-provider and drop test disablement master
authorSimo Sorce <simo@redhat.com>
Tue, 4 Aug 2026 16:35:19 +0000 (12:35 -0400)
committerDmitry Belyavskiy <beldmit@gmail.com>
Thu, 6 Aug 2026 12:15:56 +0000 (14:15 +0200)
This version of pkcs11-provider has been fixed to work with
OpenSSL ASN1 changes and the test passes again.

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Milan Broz <mbroz@openssl.org>
MergeDate: Thu Aug  6 12:16:37 2026
(Merged from https://github.com/openssl/openssl/pull/32180)

pkcs11-provider
test/recipes/95-test_external_pkcs11_provider_data/patches/0002-Temporarily-disable-the-pem-encoder.patch [deleted file]

index 5dcc876263c083d44944d84e6425497529f8ff54..eb157e48066fdb2b5735f6f327ed7ae65c51eb6f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5dcc876263c083d44944d84e6425497529f8ff54
+Subproject commit eb157e48066fdb2b5735f6f327ed7ae65c51eb6f
diff --git a/test/recipes/95-test_external_pkcs11_provider_data/patches/0002-Temporarily-disable-the-pem-encoder.patch b/test/recipes/95-test_external_pkcs11_provider_data/patches/0002-Temporarily-disable-the-pem-encoder.patch
deleted file mode 100644 (file)
index 2498938..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 891c0d9a615ce37506969875792afdb6defe9b79 Mon Sep 17 00:00:00 2001
-From: Bob Beck <beck@openssl.org>
-Date: Wed, 10 Jun 2026 16:40:37 -0600
-Subject: [PATCH] Temporarily disable the pem encoder
-
-This appears to have some sort of internal error fetching ec keys
-from the softhsm. (and appears to also be disabled for
-similar reasons on some linux distros)
----
- tests/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 6050fe5..24520d1 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -155,7 +155,6 @@ tests = {
-   'oaepsha2': {'suites': ['softokn', 'kryoptic', 'kryoptic.nss']},
-   'hkdf': {'suites': ['softokn', 'kryoptic', 'kryoptic.nss']},
-   'imported' : {'suites': ['softokn', 'kryoptic', 'kryoptic.nss']},
--  'pem_encoder': {'suites': all_suites},
-   'rsa': {'suites': all_suites},
-   'rsapss': {'suites': all_suites},
-   'rsapssam': {'suites': ['softhsm', 'kryoptic']},
--- 
-2.53.0
-