Fix overly lenient comparisons:

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

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 81bc5ff93395395b3b6e5f40cdf38e77cc4f7cc1..37ddcf9e128eb2ef6f29eebf335552c27775af1c 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -70,15 +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
-#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_AESNI)
-       ENGINE_load_aesni();
-#endif
-#ifndef OPENSSL_NO_RSAX
-       ENGINE_load_rsax();
-#endif
 #ifndef OPENSSL_NO_RDRAND
        ENGINE_load_rdrand();
 #endif
@@ -126,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) {