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 /include/internal | |
| 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 'include/internal')
| -rw-r--r-- | include/internal/ktls.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/internal/ktls.h b/include/internal/ktls.h index 9212bb4343..535e563479 100644 --- a/include/internal/ktls.h +++ b/include/internal/ktls.h @@ -346,9 +346,10 @@ static ossl_inline int ktls_configure_crypto(const EVP_CIPHER *c, int tls_versio if (tls_version == TLS1_2_VERSION && EVP_CIPHER_mode(c) == EVP_CIPH_GCM_MODE) { - EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_GET_IV, - EVP_GCM_TLS_FIXED_IV_LEN + EVP_GCM_TLS_EXPLICIT_IV_LEN, - geniv); + if (!EVP_CIPHER_CTX_get_iv_state(dd, geniv, + EVP_GCM_TLS_FIXED_IV_LEN + + EVP_GCM_TLS_EXPLICIT_IV_LEN)) + return 0; iiv = geniv; } |