diff options
author | Benjamin Kaduk <bkaduk@akamai.com> | 2020-07-02 13:03:58 -0700 |
---|---|---|
committer | Benjamin Kaduk <bkaduk@akamai.com> | 2020-08-11 07:07:57 -0700 |
commit | 37322687b0fb4c5c0bb637acd3e9785ffc71fa35 (patch) | |
tree | 43b0f2f193cdba292f4905424ebfd78c5e0ddbcf /crypto/evp | |
parent | c76ffc78a513660b5f62bc32a64f44c62edede74 (diff) |
Retire EVP_CTRL_GET_IV
It is superseded by EVP_CIPHER_CTX_get_iv(), is only present on master,
and had only a couple of in-tree callers that are easy to convert.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12233)
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/e_aes.c | 8 | ||||
-rw-r--r-- | crypto/evp/evp_enc.c | 6 |
2 files changed, 0 insertions, 14 deletions
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index c037090695..dca83bcd5c 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -2588,14 +2588,6 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) memcpy(ptr, c->buf, arg); return 1; - case EVP_CTRL_GET_IV: - if (gctx->iv_gen != 1 && gctx->iv_gen_rand != 1) - return 0; - if (gctx->ivlen != arg) - return 0; - memcpy(ptr, gctx->iv, arg); - return 1; - case EVP_CTRL_GCM_SET_IV_FIXED: /* Special case: -1 length restores whole IV */ if (arg == -1) { diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 44108db30b..71b5386232 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -971,12 +971,6 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) case EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS: /* Used by DASYNC */ default: goto end; - case EVP_CTRL_GET_IV: - set_params = 0; - params[0] = - OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV_STATE, ptr, - sz); - break; case EVP_CTRL_AEAD_SET_IVLEN: if (arg < 0) return 0; |