From: Richard Levitte <levitte@openssl.org>
Date: Fri, 8 Jan 2016 12:24:15 +0000 (+0100)
Subject: Add back deprecated functions in macro form
X-Git-Tag: OpenSSL_1_1_0-pre2~43
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0ce56222d803c73fb621bf2539eedf945e7c3ebf;p=oweals%2Fopenssl.git

Add back deprecated functions in macro form

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 66fb612bf2..6441de449e 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -544,6 +544,9 @@ void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
 void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
 void *EVP_CIPHER_CTX_cipher_data(const EVP_CIPHER_CTX *ctx);
 # define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
+# if OPENSSL_API_COMPAT < 0x10100000L
+#  define EVP_CIPHER_CTX_flags(c)       EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(c))
+# endif
 # define EVP_CIPHER_CTX_mode(c)         EVP_CIPHER_mode(EVP_CIPHER_CTX_cipher(c))
 
 # define EVP_ENCODE_LENGTH(l)    (((l+2)/3*4)+(l/48+1)*2+80)
@@ -711,6 +714,10 @@ int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
                     char *out, int *outl);
 int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
 
+# if OPENSSL_API_COMPAT < 0x10100000L
+#  EVP_CIPHER_CTX_init(c)      EVP_CIPHER_CTX_reset(c)
+#  EVP_CIPHER_CTX_cleanup(c)   EVP_CIPHER_CTX_reset(c)
+# endif
 EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
 int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
 void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *c);