diff --git a/softhsm-2.3.0-reset-mutex-callbacks.patch b/softhsm-2.3.0-reset-mutex-callbacks.patch deleted file mode 100644 index 2bf40472126779c2833021b9c7cd00786f89636e..0000000000000000000000000000000000000000 --- a/softhsm-2.3.0-reset-mutex-callbacks.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 16f994e7944a917fa81c8db11c56c594f4e78b40 Mon Sep 17 00:00:00 2001 -From: Alexander Bokovoy -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 ---- - 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 - diff --git a/softhsm-2.5.0.tar.gz b/softhsm-2.5.0.tar.gz deleted file mode 100644 index 4bbe2c4cc0b49a1170ea300dbc849eeef4bcf522..0000000000000000000000000000000000000000 Binary files a/softhsm-2.5.0.tar.gz and /dev/null differ diff --git a/softhsm-2.5.0.tar.gz.sig b/softhsm-2.5.0.tar.gz.sig deleted file mode 100644 index 010845adf353e31be7836cffa76ffbe0a40e8513..0000000000000000000000000000000000000000 Binary files a/softhsm-2.5.0.tar.gz.sig and /dev/null differ diff --git a/softhsm-2.6.1.tar.gz b/softhsm-2.6.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b708a3d557de79cf8652e0acb2f98cabd4ebf38b Binary files /dev/null and b/softhsm-2.6.1.tar.gz differ diff --git a/softhsm-2.6.1.tar.gz.sig b/softhsm-2.6.1.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..96ffdee1e71296be8a633987fbb71fa421aa0bab Binary files /dev/null and b/softhsm-2.6.1.tar.gz.sig differ diff --git a/softhsm.spec b/softhsm.spec index 87904566bf2dd76fab9f73b8541ec180cd54a6e4..95fbf58d6b3b7cebaa91616ddc6d4383c6a8e5c2 100644 --- a/softhsm.spec +++ b/softhsm.spec @@ -1,6 +1,6 @@ Name: softhsm -Version: 2.5.0 -Release: 3 +Version: 2.6.1 +Release: 1 Summary: Software version of a PKCS#11 Hardware Security Module License: BSD URL: http://www.opendnssec.org/ @@ -96,6 +96,9 @@ if [ -f /var/softhsm/slot0.db ]; then fi %changelog +* Fri Jul 24 2020 linwei 2.6.1-1 +- update softhsm to 2.6.1 + * Fri Feb 14 2020 openEuler Buildteam 2.5.0-3 - make check after build