[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  85cdc842c8c4eb944bd385b622e4f8dfcbd5011f (commit)
       via  5534c16a871523e385f328abe5f1fc520329e6e4 (commit)
      from  b77a86535e96d8b256cb26c27d43d22904aad718 (commit)


- Log -----------------------------------------------------------------
commit 85cdc842c8c4eb944bd385b622e4f8dfcbd5011f
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 5 23:05:54 2016 +0200

    make update
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 5534c16a871523e385f328abe5f1fc520329e6e4
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 5 13:54:49 2016 +0200

    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 at openssl.org>

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

Summary of changes:
 crypto/init.c            | 10 ----------
 include/openssl/engine.h |  2 +-
 util/libcrypto.num       |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/crypto/init.c b/crypto/init.c
index 693037f..f38129f 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 e9d3ab2..f359c9e 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 */
diff --git a/util/libcrypto.num b/util/libcrypto.num
index e9966eb..aa303c7 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -3307,7 +3307,7 @@ EVP_read_pw_string_min                  3254	1_1_0	EXIST::FUNCTION:UI
 X509_set_notBefore                      3255	1_1_0	EXIST::FUNCTION:
 MD4                                     3256	1_1_0	EXIST::FUNCTION:MD4
 EVP_PKEY_CTX_dup                        3257	1_1_0	EXIST::FUNCTION:
-ENGINE_setup_bsd_cryptodev              3258	1_1_0	EXIST:__FreeBSD__:FUNCTION:ENGINE
+ENGINE_setup_bsd_cryptodev              3258	1_1_0	EXIST:__FreeBSD__:FUNCTION:DEPRECATEDIN_1_1_0,ENGINE
 PEM_read_bio_DHparams                   3259	1_1_0	EXIST::FUNCTION:DH
 CMS_SharedInfo_encode                   3260	1_1_0	EXIST::FUNCTION:CMS
 ASN1_OBJECT_create                      3261	1_1_0	EXIST::FUNCTION: