From 7cff78e6d2f228bcb76663cf6ece9d865170ae8b Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 10 Jun 2014 16:15:19 +0000
Subject: Abandon the auto-ENGINE /dev/crypto interface.  VIA 3des cbc receives
 collateral damage.

The syncronous nature of this mechanism has hampered performance for
symmetric crypto relative to brute-force cpu. The assymetric crypto
support never really materialized in drivers.

So abandon the complexity.
ok tedu beck mikeb
some disagrement from djm but if he wants to test /dev/crypto ciphers
he should do it without this this gigantic API in the way
---
 src/lib/libcrypto/engine/eng_all.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'src/lib/libcrypto/engine/eng_all.c')

diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index eb933153e1..4d07299efe 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -71,9 +71,7 @@ ENGINE_load_builtin_engines(void)
 	 * *no* builtin implementations). */
 	ENGINE_load_openssl();
 #endif
-#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
-	ENGINE_load_cryptodev();
-#endif
+
 #ifndef OPENSSL_NO_RSAX
 	ENGINE_load_rsax();
 #endif
@@ -87,17 +85,3 @@ ENGINE_load_builtin_engines(void)
 #endif
 	ENGINE_register_all_complete();
 }
-
-#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) {
-		ENGINE_load_cryptodev();
-		ENGINE_register_all_complete();
-	}
-	bsd_cryptodev_default_loaded = 1;
-}
-#endif
-- 
cgit v1.2.3-55-g6feb