summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2015-12-18 15:06:30 +0100
committerRichard Levitte <levitte@openssl.org>2016-01-12 13:52:22 +0100
commit480d33237df3894ea8df6f2a2e2076fa30efb205 (patch)
treeaaaca132075beee72423f7e499d05374bcf0dc28 /include
parent846ec07d904f9cc81d486db0db14fb84f61ff6e5 (diff)
downloadopenssl-new-480d33237df3894ea8df6f2a2e2076fa30efb205.tar.gz
Remove EVP_CIPHER_CTX_flags, it's only confusing
EVP_CIPHER_CTX_flags was returning the flags of its associated EVP_CIPHER. However, EVP_CIPHER_CTX has flags of its own, so this function is quite confusing and therefore error prone. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
-rw-r--r--include/openssl/evp.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 281085d923..c6a4580e68 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -526,8 +526,7 @@ void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
void *EVP_CIPHER_CTX_cipher_data(const EVP_CIPHER_CTX *ctx);
void EVP_CIPHER_CTX_new_cipher_data(EVP_CIPHER_CTX *ctx, size_t size);
# define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
-unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_mode(e) (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)
+# 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)
# define EVP_DECODE_LENGTH(l) ((l+3)/4*3+80)