diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-08-08 13:19:23 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-08-08 13:19:23 +1000 |
| commit | 728f9449c3e5a974593c516cd609b60e760ed537 (patch) | |
| tree | a56350cad75a7b6dba1b641f132d78c58e5dc66d /include | |
| parent | da4ea0cfe63619899ceb7575a7c8fbf1507fdcb6 (diff) | |
Change EVP_CIPHER_CTX_iv_length() to return current ivlen for some modes
Note a flag needed to be added since some ssl tests fail if they output any error
(even if the error is ignored). Only ciphers that handle the GET_IV_LEN control set this flag.
Fixes #8330
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9499)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index dd1117d0fe..545654a98b 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -260,6 +260,8 @@ int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, # define EVP_CIPH_RAND_KEY 0x200 /* cipher has its own additional copying logic */ # define EVP_CIPH_CUSTOM_COPY 0x400 +/* Don't use standard iv length function */ +# define EVP_CIPH_CUSTOM_IV_LENGTH 0x800 /* Allow use default ASN1 get/set iv */ # define EVP_CIPH_FLAG_DEFAULT_ASN1 0x1000 /* Buffer length in bits not bytes: CFB1 mode only */ @@ -349,6 +351,8 @@ int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, /* Set the input buffer lengths to use for a pipelined operation */ # define EVP_CTRL_SET_PIPELINE_INPUT_LENS 0x24 +# define EVP_CTRL_GET_IVLEN 0x25 + /* Padding modes */ #define EVP_PADDING_PKCS7 1 #define EVP_PADDING_ISO7816_4 2 |