Update SoftHSM v2.0 to the latest version

[aaf/sshsm.git] / SoftHSMv2 / src / lib / crypto / OSSLCryptoFactory.cpp

diff --git a/SoftHSMv2/src/lib/crypto/OSSLCryptoFactory.cpp b/SoftHSMv2/src/lib/crypto/OSSLCryptoFactory.cpp
index ad27482..04d383d 100644 (file)
--- a/SoftHSMv2/src/lib/crypto/OSSLCryptoFactory.cpp
+++ b/SoftHSMv2/src/lib/crypto/OSSLCryptoFactory.cpp
@@ -55,6 +55,9 @@
 #include "OSSLGOSTR3411.h"
 #include "OSSLGOST.h"
 #endif
+#ifdef WITH_EDDSA
+#include "OSSLEDDSA.h"
+#endif
 
 #include <algorithm>
 #include <string.h>
@@ -138,6 +141,27 @@ OSSLCryptoFactory::OSSLCryptoFactory()
        // Initialise OpenSSL
        OpenSSL_add_all_algorithms();
 
+#if !( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
+       // Make sure RDRAND is loaded first
+       ENGINE_load_rdrand();
+#endif
+       // Locate the engine
+       rdrand_engine = ENGINE_by_id("rdrand");
+       // Use RDRAND if available
+       if (rdrand_engine != NULL)
+       {
+               // Initialize RDRAND engine
+               if (!ENGINE_init(rdrand_engine))
+               {
+                       WARNING_MSG("ENGINE_init returned %lu\n", ERR_get_error());
+               }
+               // Set RDRAND engine as the default for RAND_ methods
+               else if (!ENGINE_set_default(rdrand_engine, ENGINE_METHOD_RAND))
+               {
+                       WARNING_MSG("ENGINE_set_default returned %lu\n", ERR_get_error());
+               }
+       }
+
        // Initialise the one-and-only RNG
        rng = new OSSLRNG();
 
@@ -147,6 +171,10 @@ OSSLCryptoFactory::OSSLCryptoFactory()
        ENGINE_load_builtin_engines();
 #else
        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN |
+                           OPENSSL_INIT_ENGINE_RDRAND |
+                           OPENSSL_INIT_LOAD_CRYPTO_STRINGS |
+                           OPENSSL_INIT_ADD_ALL_CIPHERS |
+                           OPENSSL_INIT_ADD_ALL_DIGESTS |
                            OPENSSL_INIT_LOAD_CONFIG, NULL);
 #endif
 
@@ -290,6 +318,10 @@ AsymmetricAlgorithm* OSSLCryptoFactory::getAsymmetricAlgorithm(AsymAlgo::Type al
 #ifdef WITH_GOST
                case AsymAlgo::GOST:
                        return new OSSLGOST();
+#endif
+#ifdef WITH_EDDSA
+               case AsymAlgo::EDDSA:
+                       return new OSSLEDDSA();
 #endif
                default:
                        // No algorithm implementation is available