support OpenSSL 3.x cipher IV API change

OpenSSL renamed the "get current CIPHER_CTX" IV operation in 3.x.
This uses the new name if available.

https://github.com/openssl/openssl/issues/13411

bz#3238 ok dtucker@

diff --git a/configure.ac b/configure.ac
index 6b75cf9714e26e2e9abd20817f9c9aac5f32389c..fe2257314dfe46a333bad81dcfc34fc0c9d3c3e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2867,6 +2867,7 @@ if test "x$openssl" = "xyes" ; then
                EVP_CIPHER_CTX_iv \
                EVP_CIPHER_CTX_iv_noconst \
                EVP_CIPHER_CTX_get_iv \
+               EVP_CIPHER_CTX_get_updated_iv \
                EVP_CIPHER_CTX_set_iv \
                RSA_get0_crt_params \
                RSA_get0_factors \

diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 388ae8aa00775d3615e2367ab40963f74425ad20..8ca50b5ace630d2f96acf35a37ba39f99cdab449 100644 (file)
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -113,8 +113,12 @@ int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key);
 #endif /* HAVE_DSA_SET0_KEY */
 
 #ifndef HAVE_EVP_CIPHER_CTX_GET_IV
+# ifdef HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV
+#  define EVP_CIPHER_CTX_get_iv EVP_CIPHER_CTX_get_updated_iv
+# else /* HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV */
 int EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx,
     unsigned char *iv, size_t len);
+# endif /* HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV */
 #endif /* HAVE_EVP_CIPHER_CTX_GET_IV */
 
 #ifndef HAVE_EVP_CIPHER_CTX_SET_IV