Compare commits
No commits in common. "c8-stream-DL1" and "stream-idm-DL1-rhel-8.10.0" have entirely different histories.
c8-stream-
...
stream-idm
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
SOURCES/softhsm-2.6.0.tar.gz
|
SOURCES/softhsm-2.6.0.tar.gz
|
||||||
|
/softhsm-2.6.0.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
da4220189c358741a42a63442561ec07996badaf SOURCES/softhsm-2.6.0.tar.gz
|
da4220189c358741a42a63442561ec07996badaf softhsm-2.6.0.tar.gz
|
||||||
|
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# recipients: abokovoy, frenaud, kaleem, ftrivino
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-9
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: idm-ci.brew-build.tier1.functional}
|
11
softhsm-2.5.0-gcc10.patch
Normal file
11
softhsm-2.5.0-gcc10.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -Nrup a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
|
||||||
|
--- a/src/lib/SoftHSM.cpp 2019-09-23 10:45:59.979484657 -0600
|
||||||
|
+++ b/src/lib/SoftHSM.cpp 2019-09-23 10:46:46.394199562 -0600
|
||||||
|
@@ -78,6 +78,7 @@
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <algorithm>
|
||||||
|
+#include <stdexcept>
|
||||||
|
|
||||||
|
// Initialise the one-and-only instance
|
||||||
|
|
1936
softhsm-2.5.0-updates.patch
Normal file
1936
softhsm-2.5.0-updates.patch
Normal file
File diff suppressed because it is too large
Load Diff
72
softhsm-2.6.1-rh1834909-exit.patch
Normal file
72
softhsm-2.6.1-rh1834909-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]);
|
1011
softhsm-openssl3-tests.patch
Normal file
1011
softhsm-openssl3-tests.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user