bn/asm/x86_64-mont*.pl: add MULX/ADCX/ADOX code path.

[openssl.git] / crypto / engine / eng_all.c

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 2c8d1869a4ccf13ab5b167df5e168d8a9fe2a77c..37ddcf9e128eb2ef6f29eebf335552c27775af1c 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -70,12 +70,9 @@ void ENGINE_load_builtin_engines(void)
         * *no* builtin implementations). */
        ENGINE_load_openssl();
 #endif
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
        ENGINE_load_cryptodev();
 #endif
-#ifndef OPENSSL_NO_RSAX
-       ENGINE_load_rsax();
-#endif
 #ifndef OPENSSL_NO_RDRAND
        ENGINE_load_rdrand();
 #endif
@@ -106,9 +103,9 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_UBSEC
        ENGINE_load_ubsec();
 #endif
-/*#ifndef OPENSSL_NO_HW_PADLOCK
+#ifndef OPENSSL_NO_HW_PADLOCK
        ENGINE_load_padlock();
-       #endif*/
+#endif
 #endif
 #ifndef OPENSSL_NO_GOST
        ENGINE_load_gost();
@@ -123,7 +120,7 @@ void ENGINE_load_builtin_engines(void)
        ENGINE_register_all_complete();
        }
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
 void ENGINE_setup_bsd_cryptodev(void) {
        static int bsd_cryptodev_default_loaded = 0;
        if (!bsd_cryptodev_default_loaded) {