diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2021-01-14 15:19:46 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-01-18 14:27:44 +0100 |
| commit | 0d83b7b9036feea680ba45751df028ff5e86cd63 (patch) | |
| tree | 69bb5df9b0f0d294ab46f1dd324279c43672553b /ssl/ktls.c | |
| parent | 3aff5b4bac7186fda9208a76127eff040cafae13 (diff) | |
Rename EVP_CIPHER_CTX_get_iv and EVP_CIPHER_CTX_get_iv_state for clarity
To clarify the purpose of these two calls rename them to
EVP_CIPHER_CTX_get_original_iv and EVP_CIPHER_CTX_get_updated_iv.
Also rename the OSSL_CIPHER_PARAM_IV_STATE to OSSL_CIPHER_PARAM_UPDATED_IV
to better align with the function name.
Fixes #13411
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13870)
Diffstat (limited to 'ssl/ktls.c')
| -rw-r--r-- | ssl/ktls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ktls.c b/ssl/ktls.c index e6c0963259..dc5bb2bbc3 100644 --- a/ssl/ktls.c +++ b/ssl/ktls.c @@ -158,9 +158,9 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, if (s->version == TLS1_2_VERSION && EVP_CIPHER_mode(c) == EVP_CIPH_GCM_MODE) { - if (!EVP_CIPHER_CTX_get_iv_state(dd, geniv, - EVP_GCM_TLS_FIXED_IV_LEN - + EVP_GCM_TLS_EXPLICIT_IV_LEN)) + if (!EVP_CIPHER_CTX_get_updated_iv(dd, geniv, + EVP_GCM_TLS_FIXED_IV_LEN + + EVP_GCM_TLS_EXPLICIT_IV_LEN)) return 0; iiv = geniv; } |