diff options
| author | Damien Miller <djm@mindrot.org> | 2021-02-18 12:06:25 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-02-18 12:06:25 +1100 |
| commit | 324449a68d510720d0e4dfcc8e9e5a702fe6a48f (patch) | |
| tree | f60f6622e65c52dbd02ec916d2468e8effddc7e4 | |
| parent | 845fe9811c047063d935eca89188ed55c993626b (diff) | |
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@
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | openbsd-compat/openssl-compat.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6b75cf97..fe225731 100644 --- 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 388ae8aa..8ca50b5a 100644 --- 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 |