[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  6c6bd9bc2f972ebadc6a326f7864b3f2edc40b5b (commit)
      from  77857ddcca41e1ad34725715fe7b32adc4de7930 (commit)


- Log -----------------------------------------------------------------
commit 6c6bd9bc2f972ebadc6a326f7864b3f2edc40b5b
Author: Cristian Stoica <cristian.stoica at freescale.com>
Date:   Tue Sep 10 12:46:46 2013 +0300

    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 at nxp.com>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/c_all.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index a3ed00d..719e34d 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
 }