Remove bsd_cryptodev engine

Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from openssl#3699)
open-quantum-safe · Jun 19, 2017 · f39a550 · f39a550
1 parent 3ac6d5e
commit f39a550
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 2,067 deletions.
diff --git a/CHANGES b/CHANGES
@@ -9,6 +9,9 @@
 
  Changes between 1.1.0f and 1.1.1 [xx XXX xxxx]
 
+  *) Removed BSD cryptodev engine.
+     [Rich Salz]
+
   *) Add a build target 'build_all_generated', to build all generated files
      and only that.  This can be used to prepare everything that requires
      things like perl for a system that lacks perl and then move everything

diff --git a/README.ENGINE b/README.ENGINE
@@ -13,7 +13,6 @@
   There are currently built-in ENGINE implementations for the following
   crypto devices:
 
-      o Cryptodev
       o Microsoft CryptoAPI
       o VIA Padlock
       o nCipher CHIL

diff --git a/crypto/engine/build.info b/crypto/engine/build.info
@@ -4,5 +4,5 @@ SOURCE[../../libcrypto]=\
         eng_table.c eng_pkey.c eng_fat.c eng_all.c \
         tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c \
         tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c tb_eckey.c \
-        eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \
+        eng_openssl.c eng_cnf.c eng_dyn.c \
         eng_rdrand.c
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
@@ -18,14 +18,8 @@ void ENGINE_load_builtin_engines(void)
     OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
 }
 
-#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(HAVE_CRYPTODEV)) && !defined(OPENSSL_NO_DEPRECATED)
+#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)) && !defined(OPENSSL_NO_DEPRECATED)
 void ENGINE_setup_bsd_cryptodev(void)
 {
-    static int bsd_cryptodev_default_loaded = 0;
-    if (!bsd_cryptodev_default_loaded) {
-        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL);
-        ENGINE_register_all_complete();
-    }
-    bsd_cryptodev_default_loaded = 1;
 }
 #endif