diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-18 15:06:30 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-01-12 13:52:22 +0100 |
| commit | 480d33237df3894ea8df6f2a2e2076fa30efb205 (patch) | |
| tree | aaaca132075beee72423f7e499d05374bcf0dc28 /crypto/evp | |
| parent | 846ec07d904f9cc81d486db0db14fb84f61ff6e5 (diff) | |
| download | openssl-480d33237df3894ea8df6f2a2e2076fa30efb205.zip openssl-480d33237df3894ea8df6f2a2e2076fa30efb205.tar.gz openssl-480d33237df3894ea8df6f2a2e2076fa30efb205.tar.bz2 | |
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 'crypto/evp')
| -rw-r--r-- | crypto/evp/evp_enc.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp_lib.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 4a5945c..3bac109 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -212,7 +212,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, return 0; } - if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_CUSTOM_IV)) { + if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_CUSTOM_IV)) { switch (EVP_CIPHER_CTX_mode(ctx)) { case EVP_CIPH_STREAM_CIPHER: diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index cc91d44..0b062db 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -242,11 +242,6 @@ unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher) return cipher->flags; } -unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx) -{ - return ctx->cipher->flags; -} - void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx) { return ctx->app_data; |