softhsm-2.3.0-reset-mutex-callbacks.patch

@@ -0,0 +1,72 @@
+From 16f994e7944a917fa81c8db11c56c594f4e78b40 Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <abokovoy@redhat.com>
+Date: Tue, 31 Jul 2018 14:59:03 +0300
+Subject: [PATCH] Reset mutex callbacks to the default version when finished
+
+If a PKCS11 API caller provided own mutex handling callbacks,
+we need to ensure they aren't used after C_Finalize is called
+and SoftHSM instance is recycled.
+
+Inability to do so may lead to a situation where callbacks might
+be provided by a different dynamically loaded object which is removed
+after C_Finalize() call. Thus, callback pointers become invalid and
+calling them leads to crashes.
+
+Fixes: https://github.com/opendnssec/SoftHSMv2/issues/408
+
+Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ src/lib/SoftHSM.cpp | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
+index ee94d3f..e4cc044 100644
+--- a/src/lib/SoftHSM.cpp
++++ b/src/lib/SoftHSM.cpp
+@@ -314,6 +314,15 @@ static CK_ATTRIBUTE bsAttribute(CK_ATTRIBUTE_TYPE type, const ByteString &value)
+ /*****************************************************************************
+  Implementation of SoftHSM class specific functions
+  *****************************************************************************/
++static void resetMutexFactoryCallbacks()
++{
++	// Reset MutexFactory callbacks to our versions
++	MutexFactory::i()->setCreateMutex(OSCreateMutex);
++	MutexFactory::i()->setDestroyMutex(OSDestroyMutex);
++	MutexFactory::i()->setLockMutex(OSLockMutex);
++	MutexFactory::i()->setUnlockMutex(OSUnlockMutex);
++}
++
+ 
+ // Return the one-and-only instance
+ SoftHSM* SoftHSM::i()
+@@ -342,6 +351,7 @@ SoftHSM::SoftHSM()
+ 	slotManager = NULL;
+ 	sessionManager = NULL;
+ 	handleManager = NULL;
++	resetMutexFactoryCallbacks();
+ }
+ 
+ // Destructor
+@@ -352,6 +362,7 @@ SoftHSM::~SoftHSM()
+ 	if (slotManager != NULL) delete slotManager;
+ 	if (objectStore != NULL) delete objectStore;
+ 	if (sessionObjectStore != NULL) delete sessionObjectStore;
++	resetMutexFactoryCallbacks();
+ }
+ 
+ /*****************************************************************************
+@@ -402,10 +413,7 @@ CK_RV SoftHSM::C_Initialize(CK_VOID_PTR pInitArgs)
+ 			if (args->flags & CKF_OS_LOCKING_OK)
+ 			{
+ 				// Use our own mutex functions.
+-				MutexFactory::i()->setCreateMutex(OSCreateMutex);
+-				MutexFactory::i()->setDestroyMutex(OSDestroyMutex);
+-				MutexFactory::i()->setLockMutex(OSLockMutex);
+-				MutexFactory::i()->setUnlockMutex(OSUnlockMutex);
++				resetMutexFactoryCallbacks();
+ 				MutexFactory::i()->enable();
+ 			}
+ 			else
+-- 
+2.17.1
+

softhsm.spec

@@ -1,6 +1,6 @@
 Name: softhsm
-Version: 2.6.1
-Release: 4
+Version: 2.5.0
+Release: 3
 Summary: Software version of a PKCS#11 Hardware Security Module
 License: BSD
 URL: http://www.opendnssec.org/
@@ -42,7 +42,7 @@ sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
 make %{?_smp_mflags}
 
 %check
-#make check
+make check
 
 %install
 rm -rf %{buildroot}
@@ -52,10 +52,9 @@ cp src/lib/*.h %{buildroot}%{_includedir}/softhsm
 mkdir -p %{buildroot}/%{_sharedstatedir}/softhsm/tokens
 mkdir -p %{buildroot}/%{_libdir}/softhsm/
 
-ln -s ../pkcs11/libsofthsm2.so %{buildroot}/%{_libdir}/softhsm/libsofthsm.so
-# Link libsofthsm2.so to /usr/lib64 because NSS needs it to
-# be in the standard library search path.
-( cd  %{buildroot}/%{_libdir} ; ln -s pkcs11/libsofthsm2.so)
+cd %{buildroot}/%{_libdir}
+ln -sf  ./pkcs11/libsofthsm2.so  ./softhsm/libsofthsm.so
+ln -sf  ./pkcs11/libsofthsm2.so   %{buildroot}/%{_libdir}/libsofthsm2.so
 
 rm %{buildroot}/%{_sysconfdir}/softhsm2.conf.sample
 rm -f %{buildroot}/%{_libdir}/pkcs11/*a
@@ -97,18 +96,6 @@ if [ -f /var/softhsm/slot0.db ]; then
 fi
 
 %changelog
-* Thu Feb 2 2023 zhengxiaoxiao<zhengxiaoxiao2@huawei.com> - 2.6.1-4
-- Disable the make check to temporarily avoid the build failure issue
-
-* Thu Oct 20 2022 zhengxiaoxiao<zhengxiaoxiao2@huawei.com> 2.6.1-3
-- update release
-
-* Fri Dec 25 2020 panxiaohe<panxiaohe@huawei.com> 2.6.1-2
-- fix relative path of libsofthsm2.so to ensure file exists
-
-* Fri Jul 24 2020 linwei<linwei54@huawei.com> 2.6.1-1
-- update softhsm to 2.6.1
-
 * Fri Feb 14 2020  openEuler Buildteam <buildteam@openeuler.org> 2.5.0-3
 - make check after build
 

softhsm.yaml

@@ -1,4 +1,4 @@
 version_control: github
-src_repo: opendnssec/SoftHSMv2
-tag_prefix:
-seperator: "."
+src_repo: opendnssec/opendnssec
+tag_prefix: 
+seperator: