Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 6033c389c1 |
231
fedora.changelog
Normal file
231
fedora.changelog
Normal file
@@ -0,0 +1,231 @@
|
||||
* Fri Feb 09 2024 Alexander Bokovoy <abokovoy@redhat.com> - 2.6.1-9
|
||||
- Prevent access to global C++ variables once they destroyed
|
||||
- Patch from Neil Horman (OpenSSL)
|
||||
|
||||
* Thu Feb 08 2024 Alexander Bokovoy <abokovoy@redhat.com> - 2.6.1-8
|
||||
- Run p11test tests individually
|
||||
- Resolves: rhbz#2261703
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-7.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Nov 09 2023 Alexander Bokovoy <abokovoy@redhat.com> - 2.6.1-7
|
||||
- fix uninitialized variable
|
||||
- bump build release to avoid confusion in the changelog
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-5.7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-5.6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-5.5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-5.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Nov 10 2021 Alexander Bokovoy <abokovoy@redhat.com> - 2.6.1-6
|
||||
- Resolves: rhbz#2021906 - softhsm: FTBFS with OpenSSL 3.0.0
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.6.1-5.3
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-5.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-5.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Dec 8 20:45:53 EST 2020 Paul Wouters <pwouters@redhat.com> - 2.6.1-5
|
||||
- rebuilt to fixup numbering clobbered by automatic bumps
|
||||
|
||||
* Mon Aug 11 2020 Jeff Law <law@redhat.org> - 2.6.1-3.4
|
||||
- Disable LTO
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-3.3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-3.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.6.1-3.1
|
||||
- Use make macros
|
||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
|
||||
* Wed May 13 2020 David Woodhouse <dwmw2@infradead.org> - 2.6.1-3
|
||||
- Resolves: rhbz#1831086 softhsm use-after-free on process exit
|
||||
Fix crash introduced by initial patch
|
||||
|
||||
* Tue May 12 2020 Paul Wouters <pwouters@redhat.com> - 2.6.1-2
|
||||
- Resolves: rhbz#1831086 softhsm use-after-free on process exit
|
||||
|
||||
* Thu Apr 30 2020 Paul Wouters <pwouters@redhat.com> - 2.6.1-1
|
||||
- Resolves: rhbz#1814324 -softhsm-2.6.1 is available
|
||||
|
||||
* Mon Mar 30 2020 Alexander Bokovoy <abokovoy@redhat.com> - 2.6.0-1
|
||||
- Resolves: rhbz#1814324 softhsm-2.6.0 is available
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-4.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Dec 14 2019 Jeff Law <law@redhat.com> - 2.5.0-4.2
|
||||
- Fix missing #includes for gcc-10
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-4.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 31 2019 Paul Wouters <pwouters@redhat.com> - 2.5.0-4
|
||||
- Pull in git master fixes to address assertion failure in make check
|
||||
- Re-enable testing
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-3.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Nov 14 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 2.5.0-3
|
||||
- Removed dependency on NSS; it was not necessary.
|
||||
|
||||
* Mon Nov 05 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 2.5.0-2
|
||||
- Rebuilt to match f29 version
|
||||
|
||||
* Mon Oct 29 2018 Simo Sorce <simo@redhat.com> - 2.5.0-1
|
||||
- Updated to latest upstream release
|
||||
|
||||
* Sat Aug 11 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 2.4.0-1
|
||||
- Updated to latest upstream release
|
||||
|
||||
* Tue Jul 31 2018 Alexander Bokovoy <abokovoy@redhat.com> - 2.3.0-4
|
||||
- Fix crash when used via p11-kit (#1607635)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Feb 02 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 2.3.0-3
|
||||
- Remove softhsm2-pk11install. Software modules are to be registered with
|
||||
p11-kit as in https://fedoraproject.org/wiki/PackagingDrafts/Pkcs11Support (#1541095).
|
||||
|
||||
* Tue Dec 05 2017 Jakub Jelen <jjelen@redhat.com> - 2.3.0-2
|
||||
- Add support for RSA-PSS from upstrem PR#335
|
||||
|
||||
* Tue Dec 05 2017 Jakub Jelen <jjelen@redhat.com> - 2.3.0-1
|
||||
- New upstream release (#1467329)
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Jun 27 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 2.2.0-2
|
||||
- Increased the level of messages that go to syslog, thus softhsm
|
||||
will no longer write on syslog when it cannot open the shared DB (#1425135)
|
||||
- Allow users in the 'ods' group to store their keys in /var/lib/softhsm/tokens/
|
||||
while at the same time disallow deleting other users' keys (using the
|
||||
sticky bit). Prevent users in the 'ods' group from writing in /var/lib/softhsm.
|
||||
|
||||
* Thu Jun 22 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 2.2.0-1
|
||||
- Rebased to latest upstream release
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Sep 23 2016 Paul Wouters <pwouters@redhat.com> - 2.1.0-2
|
||||
- Resolves: rhbz#1378800 Module cleanup crash
|
||||
|
||||
* Mon May 16 2016 Paul Wouters <pwouters@redhat.com> - 2.1.0-1
|
||||
- Resolves: rhbz#1244461 Updated to 2.1.0
|
||||
- Resolves: rhbz#1272423 Softhsm PKCS#11 module not visible to NSS becasue it is not in the search path
|
||||
- Resolves: rhbz#1177086 A marked as trusted certificate cannot be written in a softhsmv2 db
|
||||
- Resolves: rhbz#1272453 - A marked as CA certificate cannot be written in a softhsmv2 db
|
||||
- Removed merged in bug#162 patch
|
||||
- Temporarily disable make check because cppunit is broken
|
||||
|
||||
* Thu Feb 25 2016 Paul Wouters <pwouters@redhat.com> - 2.0.0-2
|
||||
- Resolves: rhbz#1272453 A marked as CA certificate cannot be written in a softhsmv2 db
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Sep 02 2015 Paul Wouters <pwouters@redhat.com> - 2.0.0-1
|
||||
- Resolves: rhbz#1244461 Update to softhsm-2.0.0
|
||||
- Resolves: rhbz#1177086 A marked as trusted certificate cannot be written in a softhsmv2 db
|
||||
- Resolves: rhbz#1159827 Typo in homedir in /etc/passwd
|
||||
- Added global prever to toggle snapshot vs full release build changes
|
||||
|
||||
* Fri Jun 26 2015 Petr Spacek <pspacek@redhat.com> - 2.0.0rc1-3
|
||||
- Add dependency on OpenSSL with fixed AES wrapping support
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0rc1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Jun 01 2015 Petr Spacek <pspacek@redhat.com> - 2.0.0rc1-1
|
||||
- Rebase to latest upstream release
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.0.0b1-4
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Tue Sep 30 2014 Paul Wouters <pwouters@redhat.com> - 2.0.0b1-3
|
||||
- Add support for CKM_RSA_PKCS_OAEP key un/wrapping [Petr Spacek]
|
||||
- Use OpenSSL EVP interface for AES key wrapping [Petr Spacek]
|
||||
- Fix softhsm2-pk11install buid and post call
|
||||
- Do not use --with-objectstore-backend-db (causes issues on i686)
|
||||
- Change install directory to /usr/lib*/pkcs11/
|
||||
- Install pkcs11 module file
|
||||
- Use official upstream tar ball
|
||||
- Create ods user to own softhsm/token files
|
||||
- Enable migration tools (for softhsm-v1 installs)
|
||||
- Add softlink for softhsm-v1 .so (needed for opendnssec's conf.xml)
|
||||
- Require p11-kit, nss-tools, for SoftHSM PKCS #11 Module file
|
||||
- Copy pk11install.c from coolkey package
|
||||
- Enable hardened build
|
||||
- Add upstream official source url
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri Apr 18 2014 Paul Wouters <pwouters@redhat.com> - 1.3.6-1
|
||||
- Updated to 1.3.6 (rhbz#1070196)
|
||||
- Provide a p11-kit module file (rhbz#1085327)
|
||||
|
||||
* Sun Nov 03 2013 Paul Wouters <pwouters@redhat.com> - 1.3.5-1
|
||||
- Updated to 1.3.5 (rhbz#987721)
|
||||
|
||||
* Tue Jul 30 2013 Paul Wouters <pwouters@redhat.com> - 1.3.3-4
|
||||
- Rebuilt for new botan - requires --with-botan argument
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Jun 04 2012 Paul Wouters <pwouters@redhat.com> - 1.3.3-1
|
||||
- Updated to 1.3.3
|
||||
|
||||
* Tue Apr 03 2012 Paul Wouters <pwouters@redhat.com> - 1.3.2-1
|
||||
- Updated to 1.3.2.
|
||||
- Changed user from opendnssec to ods, as used in the opendnssec package
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Oct 27 2011 Paul Wouters <paul@xelerance.com> - 1.3.0-3
|
||||
- Initial Fedora package
|
||||
- Do not install the .a file
|
||||
- Use a separate "opendnssec" user to own /var/sofhsm
|
||||
|
||||
* Tue Oct 25 2011 Paul Wouters <paul@xelerance.com> - 1.3.0-2
|
||||
- Fix description texts w.r.t. include files
|
||||
|
||||
* Wed Oct 05 2011 Paul Wouters <paul@xelerance.com> - 1.3.0-1
|
||||
- Upgraded to 1.3.0
|
||||
|
||||
* Thu Mar 3 2011 Paul Wouters <paul@xelerance.com> - 1.2.0-1
|
||||
- Initial package for Fedora
|
||||
2
ods-user.conf
Normal file
2
ods-user.conf
Normal file
@@ -0,0 +1,2 @@
|
||||
#Type Name ID GECOS Home directory Shell
|
||||
u ods - "softhsm private keys owner" /var/lib/softhsm -
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:92aa56cf45e25892326e98b851c44de9cac8559e208720e579bf8e2cd1c132b2
|
||||
size 1078439
|
||||
72
softhsm-2.6.1-rh1831086-exit.patch
Normal file
72
softhsm-2.6.1-rh1831086-exit.patch
Normal file
@@ -0,0 +1,72 @@
|
||||
diff --git a/src/lib/crypto/OSSLCryptoFactory.cpp b/src/lib/crypto/OSSLCryptoFactory.cpp
|
||||
index 32daca2..ace4bcb 100644
|
||||
--- a/src/lib/crypto/OSSLCryptoFactory.cpp
|
||||
+++ b/src/lib/crypto/OSSLCryptoFactory.cpp
|
||||
@@ -226,31 +226,49 @@ err:
|
||||
// Destructor
|
||||
OSSLCryptoFactory::~OSSLCryptoFactory()
|
||||
{
|
||||
-#ifdef WITH_GOST
|
||||
- // Finish the GOST engine
|
||||
- if (eg != NULL)
|
||||
+ bool ossl_shutdown = false;
|
||||
+
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
+ // OpenSSL 1.1.0+ will register an atexit() handler to run
|
||||
+ // OPENSSL_cleanup(). If that has already happened we must
|
||||
+ // not attempt to free any ENGINEs because they'll already
|
||||
+ // have been destroyed and the use-after-free would cause
|
||||
+ // a deadlock or crash.
|
||||
+ //
|
||||
+ // Detect that situation because reinitialisation will fail
|
||||
+ // after OPENSSL_cleanup() has run.
|
||||
+ (void)ERR_set_mark();
|
||||
+ ossl_shutdown = !OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_RDRAND, NULL);
|
||||
+ (void)ERR_pop_to_mark();
|
||||
+#endif
|
||||
+ if (!ossl_shutdown)
|
||||
{
|
||||
- ENGINE_finish(eg);
|
||||
- ENGINE_free(eg);
|
||||
- eg = NULL;
|
||||
- }
|
||||
+#ifdef WITH_GOST
|
||||
+ // Finish the GOST engine
|
||||
+ if (eg != NULL)
|
||||
+ {
|
||||
+ ENGINE_finish(eg);
|
||||
+ ENGINE_free(eg);
|
||||
+ eg = NULL;
|
||||
+ }
|
||||
#endif
|
||||
|
||||
- // Finish the rd_rand engine
|
||||
- ENGINE_finish(rdrand_engine);
|
||||
- ENGINE_free(rdrand_engine);
|
||||
- rdrand_engine = NULL;
|
||||
+ // Finish the rd_rand engine
|
||||
+ ENGINE_finish(rdrand_engine);
|
||||
+ ENGINE_free(rdrand_engine);
|
||||
+ rdrand_engine = NULL;
|
||||
|
||||
+ // Recycle locks
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+ if (setLockingCallback)
|
||||
+ {
|
||||
+ CRYPTO_set_locking_callback(NULL);
|
||||
+ }
|
||||
+#endif
|
||||
+ }
|
||||
// Destroy the one-and-only RNG
|
||||
delete rng;
|
||||
|
||||
- // Recycle locks
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
- if (setLockingCallback)
|
||||
- {
|
||||
- CRYPTO_set_locking_callback(NULL);
|
||||
- }
|
||||
-#endif
|
||||
for (unsigned i = 0; i < nlocks; i++)
|
||||
{
|
||||
MutexFactory::i()->recycleMutex(locks[i]);
|
||||
12
softhsm-2.6.1-uninitialized.patch
Normal file
12
softhsm-2.6.1-uninitialized.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
|
||||
index d2bf4037a..6eeac6103 100644
|
||||
--- a/src/lib/SoftHSM.cpp
|
||||
+++ b/src/lib/SoftHSM.cpp
|
||||
@@ -972,6 +972,7 @@ CK_RV SoftHSM::C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_
|
||||
}
|
||||
CryptoFactory::i()->recycleAsymmetricAlgorithm(eddsa);
|
||||
#endif
|
||||
+ pInfo->flags = 0; // initialize flags
|
||||
switch (type)
|
||||
{
|
||||
#ifndef WITH_FIPS
|
||||
BIN
softhsm-2.6.1.tar.gz
LFS
Normal file
BIN
softhsm-2.6.1.tar.gz
LFS
Normal file
Binary file not shown.
BIN
softhsm-2.6.1.tar.gz.sig
Normal file
BIN
softhsm-2.6.1.tar.gz.sig
Normal file
Binary file not shown.
1011
softhsm-openssl3-tests.patch
Normal file
1011
softhsm-openssl3-tests.patch
Normal file
File diff suppressed because it is too large
Load Diff
667
softhsm-prevent-global-deleted-objects-access.patch
Normal file
667
softhsm-prevent-global-deleted-objects-access.patch
Normal file
@@ -0,0 +1,667 @@
|
||||
From 41968e7b742ad59046523a7eeb63514237fb63af Mon Sep 17 00:00:00 2001
|
||||
From: Neil Horman <nhorman@openssl.org>
|
||||
Date: Fri, 27 Oct 2023 14:57:37 -0400
|
||||
Subject: [PATCH] Prevent accessing of global c++ objects once they are deleted
|
||||
|
||||
Fixes (Maybe) #729.
|
||||
Reset objects_deleted after reset is called.
|
||||
---
|
||||
src/lib/SoftHSM.cpp | 5 ++
|
||||
src/lib/main.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 143 insertions(+)
|
||||
|
||||
diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
|
||||
index 02c0f95ec..95bf208da 100644
|
||||
--- a/src/lib/SoftHSM.cpp
|
||||
+++ b/src/lib/SoftHSM.cpp
|
||||
@@ -89,6 +89,8 @@
|
||||
|
||||
// Initialise the one-and-only instance
|
||||
|
||||
+int objects_deleted = 0;
|
||||
+
|
||||
#ifdef HAVE_CXX11
|
||||
|
||||
std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
|
||||
@@ -406,6 +408,8 @@ void SoftHSM::reset()
|
||||
{
|
||||
if (instance.get())
|
||||
instance.reset();
|
||||
+
|
||||
+ objects_deleted = 0;
|
||||
}
|
||||
|
||||
// Constructor
|
||||
@@ -445,6 +449,7 @@ SoftHSM::~SoftHSM()
|
||||
|
||||
isInitialised = false;
|
||||
|
||||
+ objects_deleted = 1;
|
||||
resetMutexFactoryCallbacks();
|
||||
}
|
||||
|
||||
diff --git a/src/lib/main.cpp b/src/lib/main.cpp
|
||||
index 2dfd0eb87..e89f18c10 100644
|
||||
--- a/src/lib/main.cpp
|
||||
+++ b/src/lib/main.cpp
|
||||
@@ -49,6 +49,8 @@
|
||||
#define PKCS_API
|
||||
#endif
|
||||
|
||||
+extern int objects_deleted;
|
||||
+
|
||||
// PKCS #11 function list
|
||||
static CK_FUNCTION_LIST functionList =
|
||||
{
|
||||
@@ -130,6 +132,8 @@ PKCS_API CK_RV C_Initialize(CK_VOID_PTR pInitArgs)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Initialize(pInitArgs);
|
||||
}
|
||||
catch (...)
|
||||
@@ -145,6 +149,8 @@ PKCS_API CK_RV C_Finalize(CK_VOID_PTR pReserved)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Finalize(pReserved);
|
||||
}
|
||||
catch (...)
|
||||
@@ -160,6 +166,8 @@ PKCS_API CK_RV C_GetInfo(CK_INFO_PTR pInfo)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetInfo(pInfo);
|
||||
}
|
||||
catch (...)
|
||||
@@ -175,6 +183,8 @@ PKCS_API CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
if (ppFunctionList == NULL_PTR) return CKR_ARGUMENTS_BAD;
|
||||
|
||||
*ppFunctionList = &functionList;
|
||||
@@ -194,6 +204,8 @@ PKCS_API CK_RV C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetSlotList(tokenPresent, pSlotList, pulCount);
|
||||
}
|
||||
catch (...)
|
||||
@@ -209,6 +221,8 @@ PKCS_API CK_RV C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetSlotInfo(slotID, pInfo);
|
||||
}
|
||||
catch (...)
|
||||
@@ -224,6 +238,8 @@ PKCS_API CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetTokenInfo(slotID, pInfo);
|
||||
}
|
||||
catch (...)
|
||||
@@ -239,6 +255,8 @@ PKCS_API CK_RV C_GetMechanismList(CK_SLOT_ID slotID, CK_MECHANISM_TYPE_PTR pMech
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetMechanismList(slotID, pMechanismList, pulCount);
|
||||
}
|
||||
catch (...)
|
||||
@@ -254,6 +272,8 @@ PKCS_API CK_RV C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetMechanismInfo(slotID, type, pInfo);
|
||||
}
|
||||
catch (...)
|
||||
@@ -269,6 +289,8 @@ PKCS_API CK_RV C_InitToken(CK_SLOT_ID slotID, CK_UTF8CHAR_PTR pPin, CK_ULONG ulP
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_InitToken(slotID, pPin, ulPinLen, pLabel);
|
||||
}
|
||||
catch (...)
|
||||
@@ -284,6 +306,8 @@ PKCS_API CK_RV C_InitPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pPin, CK_UL
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_InitPIN(hSession, pPin, ulPinLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -299,6 +323,8 @@ PKCS_API CK_RV C_SetPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pOldPin, CK_
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SetPIN(hSession, pOldPin, ulOldLen, pNewPin, ulNewLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -314,6 +340,8 @@ PKCS_API CK_RV C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApp
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_OpenSession(slotID, flags, pApplication, notify, phSession);
|
||||
}
|
||||
catch (...)
|
||||
@@ -329,6 +357,8 @@ PKCS_API CK_RV C_CloseSession(CK_SESSION_HANDLE hSession)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_CloseSession(hSession);
|
||||
}
|
||||
catch (...)
|
||||
@@ -344,6 +374,8 @@ PKCS_API CK_RV C_CloseAllSessions(CK_SLOT_ID slotID)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_CloseAllSessions(slotID);
|
||||
}
|
||||
catch (...)
|
||||
@@ -359,6 +391,8 @@ PKCS_API CK_RV C_GetSessionInfo(CK_SESSION_HANDLE hSession, CK_SESSION_INFO_PTR
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetSessionInfo(hSession, pInfo);
|
||||
}
|
||||
catch (...)
|
||||
@@ -374,6 +408,8 @@ PKCS_API CK_RV C_GetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetOperationState(hSession, pOperationState, pulOperationStateLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -389,6 +425,8 @@ PKCS_API CK_RV C_SetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SetOperationState(hSession, pOperationState, ulOperationStateLen, hEncryptionKey, hAuthenticationKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -404,6 +442,8 @@ PKCS_API CK_RV C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_UTF
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Login(hSession, userType, pPin, ulPinLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -419,6 +459,8 @@ PKCS_API CK_RV C_Logout(CK_SESSION_HANDLE hSession)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Logout(hSession);
|
||||
}
|
||||
catch (...)
|
||||
@@ -434,6 +476,8 @@ PKCS_API CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemp
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_CreateObject(hSession, pTemplate, ulCount, phObject);
|
||||
}
|
||||
catch (...)
|
||||
@@ -449,6 +493,8 @@ PKCS_API CK_RV C_CopyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_CopyObject(hSession, hObject, pTemplate, ulCount, phNewObject);
|
||||
}
|
||||
catch (...)
|
||||
@@ -464,6 +510,8 @@ PKCS_API CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DestroyObject(hSession, hObject);
|
||||
}
|
||||
catch (...)
|
||||
@@ -479,6 +527,8 @@ PKCS_API CK_RV C_GetObjectSize(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetObjectSize(hSession, hObject, pulSize);
|
||||
}
|
||||
catch (...)
|
||||
@@ -494,6 +544,8 @@ PKCS_API CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetAttributeValue(hSession, hObject, pTemplate, ulCount);
|
||||
}
|
||||
catch (...)
|
||||
@@ -509,6 +561,8 @@ PKCS_API CK_RV C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SetAttributeValue(hSession, hObject, pTemplate, ulCount);
|
||||
}
|
||||
catch (...)
|
||||
@@ -524,6 +578,8 @@ PKCS_API CK_RV C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pT
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_FindObjectsInit(hSession, pTemplate, ulCount);
|
||||
}
|
||||
catch (...)
|
||||
@@ -539,6 +595,8 @@ PKCS_API CK_RV C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR ph
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_FindObjects(hSession, phObject, ulMaxObjectCount, pulObjectCount);
|
||||
}
|
||||
catch (...)
|
||||
@@ -554,6 +612,8 @@ PKCS_API CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_FindObjectsFinal(hSession);
|
||||
}
|
||||
catch (...)
|
||||
@@ -569,6 +629,8 @@ PKCS_API CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_EncryptInit(hSession, pMechanism, hObject);
|
||||
}
|
||||
catch (...)
|
||||
@@ -584,6 +646,8 @@ PKCS_API CK_RV C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Encrypt(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -599,6 +663,8 @@ PKCS_API CK_RV C_EncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_EncryptUpdate(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -614,6 +680,8 @@ PKCS_API CK_RV C_EncryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypted
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_EncryptFinal(hSession, pEncryptedData, pulEncryptedDataLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -629,6 +697,8 @@ PKCS_API CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DecryptInit(hSession, pMechanism, hObject);
|
||||
}
|
||||
catch (...)
|
||||
@@ -644,6 +714,8 @@ PKCS_API CK_RV C_Decrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedData,
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Decrypt(hSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -659,6 +731,8 @@ PKCS_API CK_RV C_DecryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypte
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DecryptUpdate(hSession, pEncryptedData, ulEncryptedDataLen, pData, pDataLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -674,6 +748,8 @@ PKCS_API CK_RV C_DecryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DecryptFinal(hSession, pData, pDataLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -689,6 +765,8 @@ PKCS_API CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DigestInit(hSession, pMechanism);
|
||||
}
|
||||
catch (...)
|
||||
@@ -704,6 +782,8 @@ PKCS_API CK_RV C_Digest(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Digest(hSession, pData, ulDataLen, pDigest, pulDigestLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -719,6 +799,8 @@ PKCS_API CK_RV C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DigestUpdate(hSession, pPart, ulPartLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -734,6 +816,8 @@ PKCS_API CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DigestKey(hSession, hObject);
|
||||
}
|
||||
catch (...)
|
||||
@@ -749,6 +833,8 @@ PKCS_API CK_RV C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DigestFinal(hSession, pDigest, pulDigestLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -764,6 +850,8 @@ PKCS_API CK_RV C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanis
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SignInit(hSession, pMechanism, hKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -779,6 +867,8 @@ PKCS_API CK_RV C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ul
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Sign(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -794,6 +884,8 @@ PKCS_API CK_RV C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_UL
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SignUpdate(hSession, pPart, ulPartLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -809,6 +901,8 @@ PKCS_API CK_RV C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, C
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SignFinal(hSession, pSignature, pulSignatureLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -824,6 +918,8 @@ PKCS_API CK_RV C_SignRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pM
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SignRecoverInit(hSession, pMechanism, hKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -839,6 +935,8 @@ PKCS_API CK_RV C_SignRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_U
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SignRecover(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -854,6 +952,8 @@ PKCS_API CK_RV C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_VerifyInit(hSession, pMechanism, hKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -869,6 +969,8 @@ PKCS_API CK_RV C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_Verify(hSession, pData, ulDataLen, pSignature, ulSignatureLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -884,6 +986,8 @@ PKCS_API CK_RV C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_VerifyUpdate(hSession, pPart, ulPartLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -899,6 +1003,8 @@ PKCS_API CK_RV C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_VerifyFinal(hSession, pSignature, ulSignatureLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -914,6 +1020,8 @@ PKCS_API CK_RV C_VerifyRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_VerifyRecoverInit(hSession, pMechanism, hKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -929,6 +1037,8 @@ PKCS_API CK_RV C_VerifyRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignatur
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_VerifyRecover(hSession, pSignature, ulSignatureLen, pData, pulDataLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -944,6 +1054,8 @@ PKCS_API CK_RV C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DigestEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -959,6 +1071,8 @@ PKCS_API CK_RV C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DecryptDigestUpdate(hSession, pPart, ulPartLen, pDecryptedPart, pulDecryptedPartLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -974,6 +1088,8 @@ PKCS_API CK_RV C_SignEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SignEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -989,6 +1105,8 @@ PKCS_API CK_RV C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEn
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DecryptVerifyUpdate(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1004,6 +1122,8 @@ PKCS_API CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GenerateKey(hSession, pMechanism, pTemplate, ulCount, phKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1029,6 +1149,8 @@ PKCS_API CK_RV C_GenerateKeyPair
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GenerateKeyPair(hSession, pMechanism, pPublicKeyTemplate, ulPublicKeyAttributeCount, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1052,6 +1174,8 @@ PKCS_API CK_RV C_WrapKey
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_WrapKey(hSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1077,6 +1201,8 @@ PKCS_API CK_RV C_UnwrapKey
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_UnwrapKey(hSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulCount, phKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1100,6 +1226,8 @@ PKCS_API CK_RV C_DeriveKey
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_DeriveKey(hSession, pMechanism, hBaseKey, pTemplate, ulCount, phKey);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1115,6 +1243,8 @@ PKCS_API CK_RV C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_UL
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_SeedRandom(hSession, pSeed, ulSeedLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1130,6 +1260,8 @@ PKCS_API CK_RV C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomD
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GenerateRandom(hSession, pRandomData, ulRandomLen);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1145,6 +1277,8 @@ PKCS_API CK_RV C_GetFunctionStatus(CK_SESSION_HANDLE hSession)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_GetFunctionStatus(hSession);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1160,6 +1294,8 @@ PKCS_API CK_RV C_CancelFunction(CK_SESSION_HANDLE hSession)
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_CancelFunction(hSession);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1175,6 +1311,8 @@ PKCS_API CK_RV C_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_
|
||||
{
|
||||
try
|
||||
{
|
||||
+ if (objects_deleted == 1)
|
||||
+ return CKR_FUNCTION_FAILED;
|
||||
return SoftHSM::i()->C_WaitForSlotEvent(flags, pSlot, pReserved);
|
||||
}
|
||||
catch (...)
|
||||
@@ -1,17 +0,0 @@
|
||||
diff --git a/src/lib/crypto/test/RSATests.cpp b/src/lib/crypto/test/RSATests.cpp
|
||||
index 9ac5b26..fe090f4 100644
|
||||
--- a/src/lib/crypto/test/RSATests.cpp
|
||||
+++ b/src/lib/crypto/test/RSATests.cpp
|
||||
@@ -80,10 +80,11 @@ void RSATests::testKeyGeneration()
|
||||
std::vector<size_t> keySizes;
|
||||
keySizes.push_back(1024);
|
||||
#ifndef WITH_FIPS
|
||||
- keySizes.push_back(1025);
|
||||
+ //keySizes.push_back(1025);
|
||||
#endif
|
||||
keySizes.push_back(1280);
|
||||
keySizes.push_back(2048);
|
||||
+ keySizes.push_back(3072);
|
||||
//keySizes.push_back(4096);
|
||||
|
||||
for (std::vector<ByteString>::iterator e = exponents.begin(); e != exponents.end(); e++)
|
||||
@@ -1,3 +1,82 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 21 07:24:23 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Use correct SOURCE for
|
||||
/usr/share/p11-kit/modules/softhsm.module (fix bsc#1224356).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 11 16:00:16 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- We actually don't need any hard Requires for OpenSSL at all
|
||||
(and yes, rpmlint is right, we shouldn't use it at all).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 7 15:59:43 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Add creation of ods user.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 15 12:26:57 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Rebuild with inspiration (and patches) from the Fedora package.
|
||||
- Remove obsolete patch softhsm-rsakeys.patch
|
||||
- Add Fedora patches (comments in SPEC indicate their true origin):
|
||||
- softhsm-openssl3-tests.patch
|
||||
- softhsm-prevent-global-deleted-objects-access.patch
|
||||
- softhsm-2.6.1-rh1831086-exit.patch
|
||||
- softhsm-2.6.1-uninitialized.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 21 09:51:16 UTC 2022 - Marcus Meissner <meissner@suse.com>
|
||||
|
||||
- switched URL to https
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 30 15:31:19 UTC 2020 - Martin Hauke <mardnh@gmx.de>
|
||||
|
||||
- Update to version 2.6.1
|
||||
* Issue #542: Support Ed448/X448 for OpenSSL
|
||||
* Issue #538: Improved warning and compilation issues for GCC10
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 17 19:58:51 UTC 2020 - Martin Hauke <mardnh@gmx.de>
|
||||
|
||||
- Update to version 2.6.0
|
||||
|
||||
Changes:
|
||||
* Issue #493: Upgrade to Botan 2.
|
||||
* Issue #530: Update appveyor build.
|
||||
* Issue #438: Detect crypto algorithms by default.
|
||||
* Issue #455: Provide a new configuration option to allow enabling and
|
||||
disabling various mechanisms (slots.mechanisms in the softhsm2.conf).
|
||||
* Issue #479: Increase SQLite busy timeout from 15 seconds to 3 minutes.
|
||||
* Issue #513: Add configuration option to reset state on fork closing all
|
||||
sessions rather than keeping all sessions open in duplicate process.
|
||||
* Issue #500: C_WaitForSlotEvent implementation.
|
||||
* Issue #445: Add wrap support with CKM_AES_CBC.
|
||||
|
||||
Bugfixes:
|
||||
* Issue #418: Set fields to NULL to avoid double free.
|
||||
* Issue #423: ENGINE_load_rdrand is not supported with older openssl.
|
||||
* Issue #429: Updated prerequisite to build from repository.
|
||||
* Issue #434: Fix build issues with CMake.
|
||||
* Issue #435: Fix botan build without EDDSA.
|
||||
* Issue #442: Release resources from OSSLEVPSymmetricAlgorithm.
|
||||
* Issue #449/#502: Do not copy zero sized buffer avoid null pointer reference.
|
||||
* Issue #464: Race condition with multiple threads closing last session and
|
||||
opening a newer sessions.
|
||||
* Issue #452: Fixes to automake build fir undefined macros.
|
||||
* Issue #462: User PIN count wrongly calculated.
|
||||
* Issue #516: Fix memory leak in OSSLCryptoFactory.
|
||||
* Issue #494: Allow null pointers as arguments when count is zero.
|
||||
* Issue #518: Sporadic problem in closing sessions because of lookup of
|
||||
object without prior locking.
|
||||
* Issue #506: Check key type for C_EncryptInit and C_DecryptInit.
|
||||
* Issue #526: Adjust EDDSA code to return valid EC_PARAMS.
|
||||
* Issue #452: Autogen failure on undefined macro AC_MSG_ERROR.
|
||||
* Issue #527: Fixed some build errors for GCC 10.
|
||||
* Issue #470: Null pointer arguments validation for C_EncryptFinal, etc.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 20 13:38:34 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
29
softhsm.keyring
Normal file
29
softhsm.keyring
Normal file
@@ -0,0 +1,29 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
mQINBFh2dD8BEADNa4sXL2nc3XxiVxFotu4xQK31Orwtj5u150Z1jYn65u1cZE2e
|
||||
KkO7Q2tTr1/lAJvT5G+fxA0NGEQUMhqC5CZldq6d1VpaG+BLl5N25rTl+qTseeMK
|
||||
0tmrykrr7tJILdoKl4iZL48Inc1eYFPnJRYECeDH21HVzKPblLQnsxa8I2VOESG5
|
||||
uoeF8r1pAe3lJEnMnBFcQoDtrIGpdnXEjCqmiHfHp1VdDIrxRGKu0QkJ6XAvUuGD
|
||||
OCjWI8vIJgtqm6/L6Fvjfv04bYH6GeKUjE1S4qNTHErN60BrO6U+qUJ90R+vQMIe
|
||||
5/Wdo7j0QdJEPuJQyasKmaFCHcoGwcUfNJPpd0n1+Oump2wVWcd8olA5e5gamxot
|
||||
hEsVXAi4SXQx9jyfOfaiO+PlWyDBwNU14CBaSAvyxtJt4sYid8SAiiKQ6Usy5q94
|
||||
+GM07ZCeClg8crszm6/EMCHVL+6FcFZCFq02CH9tEjPM+wORszmUzvqZVNfZhB7r
|
||||
cCeWr01Pd6d4Yk1wiuLoYwLgd45yhN4QutkZ90/omA/RmoTK3yyrl0kA5crwqV0b
|
||||
mFPNiUDrIQmvZy/YHCVxE7d7jgxn4jk8yX1tm1HRFl7wUi1CmwpURPaSrvleJdh3
|
||||
OT6hd/f/OWHrNrcXdrb7m80mGkYgB1+bCP4h/7SGadWnyaGA5lGYn2nAOQARAQAB
|
||||
tEJPcGVuRE5TU0VDIERpc3RyaWJ1dGlvbiBLZXkgMjAxNyA8ZGlzdHJpYnV0aW9u
|
||||
LWtleUBvcGVuZG5zc2VjLm9yZz6JAj8EEwEIACkFAlh2dD8CGwMFCQlmAYAHCwkI
|
||||
BwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRBB9iO+T8sLlIW0D/9oR9bnsVV8jR8N
|
||||
Bm/5iPjVSZhxyH0fIQPhyWLEydAdDqD8xMCoGozKU7ISc0Oi1zfsBq06ETNGyJ4r
|
||||
1kHnVfusElXMwxk5rAoz9ZHP7ab07OXh7vEHrSi1246bxRspKo93ZY51jN090ici
|
||||
asCi7Xqa2SS5x1ImHPXfExIQ1MFrWx/8eLvI2zeGFqzjGa46x1H9MxKtUowzKgws
|
||||
j2XzUznZQfYOJtLfp6iXNo3XIKRQJwKtT0Q5esvZTi3fjVdUIf3QBzabCrzFFxvL
|
||||
R+SFtecKT+TQYqwuGhGNViGphHZfCgq4TWf3l8Kzi0LkU8yftd18R03yCstuuN4h
|
||||
uYZB2NBKr37erD+OK7qW+GbTpxstB+y9xhBhrobzDpjIACcJ2jd7QWTiQymeyR+x
|
||||
DpAUcI+iMo3NjstWW0y6a09dvBA31w+5MoasLXxzG007VvSN4X0oyQZXe0hoVXc/
|
||||
RDNMGTX7zYLLJRYEwubGKja9aVhpOHtIflW7jkG3Gq2XnIWANiB3Z7sUMQ3Cv1En
|
||||
nBGlO63seT6QxVa37S/2MCb8BMg1ymuprPCoOTtBorGDWK94rd3/vAAi/ictNYxZ
|
||||
0pr/ljQGbvp8a+bjYTgUXudQdrv8vU0GKjfkFdnW3574+dYYt7pos0hzGdluNhZk
|
||||
RKrXZHuKTf/D8BeoX3F+5lM3Y6p48Q==
|
||||
=I+Tu
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
158
softhsm.spec
158
softhsm.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package softhsm
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,36 +16,58 @@
|
||||
#
|
||||
|
||||
|
||||
%global softhsm_module "SoftHSM PKCS #11 Module"
|
||||
%global nssdb %{_sysconfdir}/pki/nssdb
|
||||
Name: softhsm
|
||||
Version: 2.6.1
|
||||
Release: 0
|
||||
Summary: Software version of a PKCS#11 Hardware Security Module
|
||||
License: BSD-2-Clause
|
||||
Group: Productivity/Security
|
||||
Name: softhsm
|
||||
Version: 2.5.0
|
||||
Release: 0
|
||||
Url: http://www.opendnssec.org/
|
||||
Source: https://dist.opendnssec.org/source/%{name}-%{version}.tar.gz
|
||||
Source1: softhsm.module
|
||||
#Git-Web: https://github.com/opendnssec/SoftHSMv2
|
||||
URL: https://www.opendnssec.org/
|
||||
Source0: https://dist.opendnssec.org/source/%{name}-%{version}.tar.gz
|
||||
Source1: https://dist.opendnssec.org/source/%{name}-%{version}.tar.gz.sig
|
||||
# taken from coolkey which is not build on all arches we build on
|
||||
Source2: softhsm2-pk11install.c
|
||||
Patch3: softhsm-rsakeys.patch
|
||||
Source5: softhsm.module
|
||||
Source6: ods-user.conf
|
||||
Source9: softhsm.keyring
|
||||
Source99: fedora.changelog
|
||||
# PATCH-FIX-UPSTREAM softhsm-2.6.1-rh1831086-exit.patch rh#1831086
|
||||
# Patch from the Fedora package (other solution is
|
||||
# gh#opendnssec/SoftHSMv2!551, upstream ticket is
|
||||
# gh#opendnssec/SoftHSMv2#548).
|
||||
Patch0: softhsm-2.6.1-rh1831086-exit.patch
|
||||
# PATCH-FIX-UPSTREAM softhsm-openssl3-tests.patch gh#opendnssec/SoftHSMv2!633
|
||||
# Make the patch compatible with OpenSSL 3
|
||||
Patch1: softhsm-openssl3-tests.patch
|
||||
# PATCH-FIX-UPSTREAM softhsm-2.6.1-uninitialized.patch
|
||||
# loosely inspired by gh#opendnssec/SoftHSMv2@f94aaffc879a
|
||||
Patch2: softhsm-2.6.1-uninitialized.patch
|
||||
# PATCH-FIX-UPSTREAM softhsm-prevent-global-deleted-objects-access.patch gh#opendnssec/SoftHSMv2#729
|
||||
# code from https://github.com/Emantor/SoftHSMv2/tree/fix/openssl3
|
||||
Patch3: softhsm-prevent-global-deleted-objects-access.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: cppunit-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libopenssl-3-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
BuildRequires: mozilla-nss-devel
|
||||
BuildRequires: mozilla-nss-tools
|
||||
BuildRequires: openssl-devel
|
||||
# Because of directory ownership
|
||||
BuildRequires: p11-kit
|
||||
BuildRequires: p11-kit-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sqlite3
|
||||
BuildRequires: sqlite3 >= 3.4.2
|
||||
BuildRequires: sqlite3-devel >= 3.4.2
|
||||
BuildRequires: sysuser-tools
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
Requires(pre): shadow
|
||||
Requires: mozilla-nss-tools
|
||||
Requires: p11-kit
|
||||
|
||||
%global softhsm_module "SoftHSM PKCS #11 Module"
|
||||
%global nssdb %{_sysconfdir}/pki/nssdb
|
||||
Requires(pre): shadow
|
||||
%sysusers_requires
|
||||
|
||||
%description
|
||||
OpenDNSSEC is providing a software implementation of a generic
|
||||
@@ -54,41 +76,44 @@ designed to meet the requirements of OpenDNSSEC, but can also work together
|
||||
with other cryptographic products because of the PKCS#11 interface.
|
||||
|
||||
%package devel
|
||||
Summary: Development package of softhsm that includes the header files
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}-%{release}, openssl-devel, sqlite3-devel
|
||||
Summary: Development package of softhsm
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: openssl-devel
|
||||
Requires: sqlite3-devel
|
||||
|
||||
%description devel
|
||||
The devel package contains the libsofthsm include files
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch3 -p1
|
||||
%autosetup -p1
|
||||
cp -p %{SOURCE99} .
|
||||
|
||||
# remove softhsm/ subdir auto-added to --libdir
|
||||
sed -i "s:full_libdir/softhsm:full_libdir:g" configure
|
||||
sed -i 's:^full_libdir=":#full_libdir=":g' configure.ac
|
||||
sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
|
||||
autoreconf -fiv
|
||||
|
||||
%build
|
||||
# This package fails its testsuite with LTO enabled and needs further
|
||||
# investigation
|
||||
%define _lto_cflags %{nil}
|
||||
autoreconf --install
|
||||
%configure --libdir=%{_libdir}/pkcs11 --with-openssl=%{_prefix} --enable-ecc --disable-gost \
|
||||
--with-migrate --enable-visibility
|
||||
%configure --libdir=%{_libdir}/pkcs11 --with-openssl=%{_prefix} --enable-ecc --enable-eddsa --disable-gost \
|
||||
--with-migrate --enable-visibility --with-p11-kit=%{_datadir}/p11-kit/modules/
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
# install our copy of pk11install taken from coolkey package
|
||||
cp %{SOURCE2} .
|
||||
gcc $(pkg-config --cflags nss) %{optflags} -c softhsm2-pk11install.c
|
||||
# Some environment variables prevent linking from being done, therefore clean up the env.
|
||||
env -i PATH=/usr/sbin:/usr/bin:/sbin:/bin gcc $(pkg-config --libs nss) -lpthread -lsoftokn3 -ldl -lz %{optflags} softhsm2-pk11install.o -o softhsm2-pk11install
|
||||
env -i PATH=%{_prefix}/sbin:%{_prefix}/bin:/sbin:/bin gcc $(pkg-config --libs nss) -lpthread -lsoftokn3 -ldl -lz %{optflags} softhsm2-pk11install.o -o softhsm2-pk11install
|
||||
|
||||
%check
|
||||
make check
|
||||
%sysusers_generate_pre %{SOURCE6} ods ods-user.conf
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make DESTDIR=%{buildroot} install
|
||||
install -D %{SOURCE1} %{buildroot}/%{_datadir}/p11-kit/modules/softhsm.module
|
||||
%make_install
|
||||
install -D %{SOURCE5} %{buildroot}/%{_datadir}/p11-kit/modules/softhsm.module
|
||||
|
||||
rm %{buildroot}/%{_sysconfdir}/softhsm2.conf.sample
|
||||
rm -f %{buildroot}/%{_libdir}/pkcs11/*a
|
||||
@@ -101,36 +126,27 @@ install -m0755 -D softhsm2-pk11install %{buildroot}/%{_bindir}/softhsm2-pk11inst
|
||||
# opendnssec have that filename in their configuration file.
|
||||
mkdir -p %{buildroot}/%{_libdir}/softhsm/
|
||||
ln -s ../pkcs11/libsofthsm2.so %{buildroot}/%{_libdir}/softhsm/libsofthsm.so
|
||||
# rhbz#1272423 NSS needs it to be in the search path too
|
||||
( cd %{buildroot}/%{_libdir} ; ln -s pkcs11/libsofthsm2.so)
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/softhsm2.conf
|
||||
%doc LICENSE README.md NEWS
|
||||
%dir %{_libdir}/pkcs11
|
||||
%dir %{_datadir}/p11-kit
|
||||
%dir %{_datadir}/p11-kit/modules
|
||||
%dir %{_libdir}/softhsm
|
||||
%{_bindir}/*
|
||||
%{_libdir}/pkcs11/libsofthsm2.so
|
||||
%{_libdir}/softhsm/libsofthsm.so
|
||||
%attr(0664,root,root) %{_datadir}/p11-kit/modules/softhsm.module
|
||||
%attr(0664,root,root) %{_datadir}/p11-kit/modules/softhsm2.module
|
||||
%attr(0770,ods,ods) %dir %{_var}/lib/softhsm
|
||||
%attr(0770,ods,ods) %dir %{_var}/lib/softhsm/tokens
|
||||
%{_mandir}/*/*
|
||||
%{_bindir}/softhsm2-pk11install
|
||||
install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/ods-user.conf
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%attr(0755,root,root) %dir %{_includedir}/softhsm
|
||||
%{_includedir}/softhsm/*.h
|
||||
%pre -f ods.pre
|
||||
|
||||
%pre
|
||||
getent group ods >/dev/null || groupadd -r ods
|
||||
getent passwd ods >/dev/null || \
|
||||
useradd -r -g ods -d /%{_sharedstatedir}/softhsm -s /sbin/nologin \
|
||||
-c "softhsm private keys owner" ods
|
||||
exit 0
|
||||
%check
|
||||
for d in crypto data_mgr handle_mgr object_store session_mgr slot_mgr ; do
|
||||
%make_build check -C src/lib/$d
|
||||
done
|
||||
|
||||
pushd src/lib/test
|
||||
%make_build p11test
|
||||
for t in TokenTests AsymWrapUnwrapTests DigestTests ForkTests \
|
||||
InitTests InfoTests SessionTests UserTests RandomTests \
|
||||
SignVerifyTests AsymEncryptDecryptTests DeriveTests \
|
||||
ObjectTests SymmetricAlgorithmTests ; do
|
||||
./p11test $t
|
||||
done
|
||||
popd
|
||||
|
||||
%post
|
||||
isThere=`modutil -rawlist -dbdir %{nssdb} | grep %{softhsm_module} || echo NO`
|
||||
@@ -142,4 +158,34 @@ if [ $1 -eq 0 ]; then
|
||||
modutil -delete %{softhsm_module} -dbdir %{nssdb} -force || :
|
||||
fi
|
||||
|
||||
%clean
|
||||
|
||||
%files
|
||||
%config(noreplace) %{_sysconfdir}/softhsm2.conf
|
||||
%license LICENSE
|
||||
%doc README.md FIPS-NOTES.md NEWS fedora.changelog
|
||||
%{_bindir}/softhsm2-dump-file
|
||||
%{_bindir}/softhsm2-keyconv
|
||||
%{_bindir}/softhsm2-migrate
|
||||
%{_bindir}/softhsm2-pk11install
|
||||
%{_bindir}/softhsm2-util
|
||||
%dir %{_libdir}/softhsm
|
||||
%{_libdir}/pkcs11/libsofthsm2.so
|
||||
%{_libdir}/softhsm/libsofthsm.so
|
||||
%{_datadir}/p11-kit/modules/softhsm.module
|
||||
%{_datadir}/p11-kit/modules/softhsm2.module
|
||||
%attr(0750,ods,ods) %dir %{_sharedstatedir}/softhsm
|
||||
%attr(1770,ods,ods) %dir %{_sharedstatedir}/softhsm/tokens
|
||||
%{_mandir}/man1/softhsm2-dump-file.1%{?ext_man}
|
||||
%{_mandir}/man1/softhsm2-keyconv.1%{?ext_man}
|
||||
%{_mandir}/man1/softhsm2-migrate.1%{?ext_man}
|
||||
%{_mandir}/man1/softhsm2-util.1%{?ext_man}
|
||||
%{_mandir}/man5/softhsm2.conf.5%{?ext_man}
|
||||
%{_sysusersdir}/ods-user.conf
|
||||
|
||||
%files devel
|
||||
%attr(0755,root,root) %dir %{_includedir}/softhsm
|
||||
%{_includedir}/softhsm/*.h
|
||||
%{_libdir}/libsofthsm2.so
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user