[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  bef763861020f450acbee037f5b02ec656b52ea2 (commit)
      from  7f0f88240e181b6c95d55893cbab55e0765a1d89 (commit)


- Log -----------------------------------------------------------------
commit bef763861020f450acbee037f5b02ec656b52ea2
Author: jwalch <jeremy.walch at gmail.com>
Date:   Fri Sep 4 15:48:20 2020 -0400

    Cleanup deprecation of ENGINE_setup_bsd_cryptodev
    
    CLA: trivial
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12793)

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

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

diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 3af9ecccc9..51260e42a2 100644
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -763,7 +763,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
 void *ENGINE_get_static_state(void);
 
 #  if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-DEPRECATEDIN_3_0(DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void)))
+DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void))
 #  endif
 
 
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 9488ffe1ee..26a9961d76 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -3189,7 +3189,7 @@ EVP_read_pw_string_min                  3254	3_0_0	EXIST::FUNCTION:
 X509_set1_notBefore                     3255	3_0_0	EXIST::FUNCTION:
 MD4                                     3256	3_0_0	EXIST::FUNCTION:DEPRECATEDIN_3_0,MD4
 EVP_PKEY_CTX_dup                        3257	3_0_0	EXIST::FUNCTION:
-ENGINE_setup_bsd_cryptodev              3258	3_0_0	EXIST:__FreeBSD__:FUNCTION:DEPRECATEDIN_1_1_0,DEPRECATEDIN_3_0,ENGINE
+ENGINE_setup_bsd_cryptodev              3258	3_0_0	EXIST:__FreeBSD__:FUNCTION:DEPRECATEDIN_1_1_0,ENGINE
 PEM_read_bio_DHparams                   3259	3_0_0	EXIST::FUNCTION:DH
 CMS_SharedInfo_encode                   3260	3_0_0	EXIST::FUNCTION:CMS
 ASN1_OBJECT_create                      3261	3_0_0	EXIST::FUNCTION: