diff options
| author | Matt Caswell <matt@openssl.org> | 2019-04-03 15:38:07 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-04-19 09:31:54 +0100 |
| commit | df05f2ce6d496232f3c86acb299a128d0eb3ef42 (patch) | |
| tree | 75b72f80d4059c21cee27433bad1ed3c5753f01e /crypto/evp/evp_err.c | |
| parent | 1393722af384cdf310645c598bbd06a3bbaa2f31 (diff) | |
Make EVP_Encrypt*/EVP_Decrypt* and EVP_Cipher* provider aware
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8700)
Diffstat (limited to 'crypto/evp/evp_err.c')
| -rw-r--r-- | crypto/evp/evp_err.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index a9f8800b08..9c79f8655e 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -53,6 +53,10 @@ static const ERR_STRING_DATA EVP_str_functs[] = { "EVP_CIPHER_CTX_ctrl"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH, 0), "EVP_CIPHER_CTX_set_key_length"}, + {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_CIPHER_CTX_SET_PADDING, 0), + "EVP_CIPHER_CTX_set_padding"}, + {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_CIPHER_FROM_DISPATCH, 0), + "evp_cipher_from_dispatch"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_CIPHER_PARAM_TO_ASN1, 0), "EVP_CIPHER_param_to_asn1"}, {ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_DECRYPTFINAL_EX, 0), @@ -246,6 +250,8 @@ static const ERR_STRING_DATA EVP_str_reasons[] = { {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY), "invalid key"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY_LENGTH), "invalid key length"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_OPERATION), "invalid operation"}, + {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_PROVIDER_FUNCTIONS), + "invalid provider functions"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SALT_LENGTH), "invalid salt length"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEYGEN_FAILURE), "keygen failure"}, |