From c6674c2f9a0b5a006dd4aef9902ac29ce1a0692e Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 4 Aug 2026 12:35:19 -0400 Subject: [PATCH] Update pkcs11-provider and drop test disablement This version of pkcs11-provider has been fixed to work with OpenSSL ASN1 changes and the test passes again. Signed-off-by: Simo Sorce Reviewed-by: Dmitry Belyavskiy Reviewed-by: Milan Broz MergeDate: Thu Aug 6 12:16:37 2026 (Merged from https://github.com/openssl/openssl/pull/32180) --- pkcs11-provider | 2 +- ...-Temporarily-disable-the-pem-encoder.patch | 27 ------------------- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 test/recipes/95-test_external_pkcs11_provider_data/patches/0002-Temporarily-disable-the-pem-encoder.patch diff --git a/pkcs11-provider b/pkcs11-provider index 5dcc876263c..eb157e48066 160000 --- a/pkcs11-provider +++ b/pkcs11-provider @@ -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 index 2498938a697..00000000000 --- a/test/recipes/95-test_external_pkcs11_provider_data/patches/0002-Temporarily-disable-the-pem-encoder.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 891c0d9a615ce37506969875792afdb6defe9b79 Mon Sep 17 00:00:00 2001 -From: Bob Beck -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 - -- 2.47.3