[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b9b5181dd2f52ff0560a33b116396cdae5e48048 (commit)
      from  498180de5c766f68f6d2b65454357bc263773c66 (commit)


- Log -----------------------------------------------------------------
commit b9b5181dd2f52ff0560a33b116396cdae5e48048
Author: Azat Khuzhin <a3at.mail at gmail.com>
Date:   Tue Nov 1 17:35:35 2016 +0300

    Remove ENGINE_load_dasync() (no OPENSSL_INIT_ENGINE_DASYNC already)
    
    Fixes: 8d00e30f96fb86b20bc992f626b188c3548fc58c ("Don't try to init
    dasync internally")
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    CLA: trivial

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

Summary of changes:
 include/openssl/engine.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 3bafa18..1544cc4 100644
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -334,8 +334,6 @@ ENGINE *ENGINE_by_id(const char *id);
     OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
 #  define ENGINE_load_capi() \
     OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
-#  define ENGINE_load_dasync() \
-    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DASYNC, NULL)
 #  define ENGINE_load_afalg() \
     OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
 # endif