[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  f8137a62d94c0a5809a4363b7b4aab3adcb8201c (commit)
      from  278d6b3663da7f02f294481694e2bd909eb4672f (commit)


- Log -----------------------------------------------------------------
commit f8137a62d94c0a5809a4363b7b4aab3adcb8201c
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Thu Dec 10 00:44:00 2015 -0500

    Restore full support for EVP_CTX_create() etc.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 include/openssl/evp.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 969a0fa..5126803 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -596,11 +596,9 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
 EVP_MD_CTX *EVP_MD_CTX_new(void);
 int EVP_MD_CTX_reset(EVP_MD_CTX *ctx);
 void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
-# ifdef OPENSSL_USE_DEPRECATED
-#  define EVP_MD_CTX_create()     EVP_MD_CTX_new()
-#  define EVP_MD_CTX_init(ctx)    EVP_MD_CTX_reset((ctx))
-#  define EVP_MD_CTX_destroy(ctx) EVP_MD_CTX_free((ctx))
-# endif
+# define EVP_MD_CTX_create()     EVP_MD_CTX_new()
+# define EVP_MD_CTX_init(ctx)    EVP_MD_CTX_reset((ctx))
+# define EVP_MD_CTX_destroy(ctx) EVP_MD_CTX_free((ctx))
 /*__owur*/ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in);
 void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags);
 void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags);