From: Richard Levitte <levitte@openssl.org>
Date: Tue, 5 Jul 2016 11:54:49 +0000 (+0200)
Subject: Stop using and deprecate ENGINE_setup_bsd_cryptodev
X-Git-Tag: OpenSSL_1_1_0-pre6~269
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5534c16a871523e385f328abe5f1fc520329e6e4;p=oweals%2Fopenssl.git

Stop using and deprecate ENGINE_setup_bsd_cryptodev

The calls we made to it were redundant, as the same initialization is
done later in OPENSSL_init_crypto() anyway.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/init.c b/crypto/init.c
index 693037fe00..f38129fa20 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -116,11 +116,6 @@ static void ossl_init_add_all_ciphers(void)
                     "openssl_add_all_ciphers_int()\n");
 # endif
     openssl_add_all_ciphers_int();
-# ifndef OPENSSL_NO_ENGINE
-#  if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-    ENGINE_setup_bsd_cryptodev();
-#  endif
-# endif
 #endif
 }
 
@@ -137,11 +132,6 @@ static void ossl_init_add_all_digests(void)
                     "openssl_add_all_digests()\n");
 # endif
     openssl_add_all_digests_int();
-# ifndef OPENSSL_NO_ENGINE
-#  if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-    ENGINE_setup_bsd_cryptodev();
-#  endif
-# endif
 #endif
 }
 
diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index e9d3ab244a..f359c9ee57 100644
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -746,7 +746,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
 void *ENGINE_get_static_state(void);
 
 # if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-void ENGINE_setup_bsd_cryptodev(void);
+DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void))
 # endif
 
 /* BEGIN ERROR CODES */