From: Cristian Stoica <cristian.stoica@freescale.com>
Date: Tue, 10 Sep 2013 09:46:46 +0000 (+0300)
Subject: remove double initialization of cryptodev engine
X-Git-Tag: OpenSSL_1_0_2i~118
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6c6bd9bc2f972ebadc6a326f7864b3f2edc40b5b;p=oweals%2Fopenssl.git

remove double initialization of cryptodev engine

cryptodev engine is initialized together with the other engines in
ENGINE_load_builtin_engines. The initialization done through
OpenSSL_add_all_algorithms is redundant.

Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>

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

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index a3ed00d4c1..719e34d22f 100644
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -82,9 +82,4 @@ void OPENSSL_add_all_algorithms_noconf(void)
     OPENSSL_cpuid_setup();
     OpenSSL_add_all_ciphers();
     OpenSSL_add_all_digests();
-#ifndef OPENSSL_NO_ENGINE
-# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-    ENGINE_setup_bsd_cryptodev();
-# endif
-#endif
 }