diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-11 17:52:30 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-11 17:52:30 +1000 |
| commit | dc64dc2edd215d6cc5843c1bfe1f0b64bff26adc (patch) | |
| tree | 2e2fb32d97e77ddc2cac66d0577dba3ddd73fa1c /include | |
| parent | 64115f05ac950390e80e3993703513cda439fca0 (diff) | |
Add EVP_CIPHER_CTX_tag_length()
There is no deprecated CTRL support for this new field.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9698)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/core_names.h | 3 | ||||
| -rw-r--r-- | include/openssl/evp.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index b11bc614a8..e1bc43d8db 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -63,7 +63,8 @@ extern "C" { #define OSSL_CIPHER_PARAM_AEAD_TLS1_AAD "tlsaad" /* octet_string */ #define OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD "tlsaadpad" /* size_t */ #define OSSL_CIPHER_PARAM_AEAD_TLS1_IV_FIXED "tlsivfixed" /* octet_string */ -#define OSSL_CIPHER_PARAM_AEAD_IVLEN OSSL_CIPHER_PARAM_IVLEN +#define OSSL_CIPHER_PARAM_AEAD_IVLEN OSSL_CIPHER_PARAM_IVLEN +#define OSSL_CIPHER_PARAM_AEAD_TAGLEN "taglen" /* size_t */ #define OSSL_CIPHER_PARAM_RANDOM_KEY "randkey" /* octet_string */ /* digest parameters */ diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 69d70e5e9c..2eb6802d3e 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -493,6 +493,7 @@ int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx); int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx); int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx); int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx); +int EVP_CIPHER_CTX_tag_length(const EVP_CIPHER_CTX *ctx); const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx); const unsigned char *EVP_CIPHER_CTX_original_iv(const EVP_CIPHER_CTX *ctx); unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx); |