diff options
| author | Pauli <paul.dale@oracle.com> | 2020-06-12 10:34:46 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-06-23 21:44:47 +1000 |
| commit | f9e504e8b1d4da4b8c9c16ee4c11e9815a800422 (patch) | |
| tree | a53b2ee1974b87cdc17f3367338ef4f8abead154 /crypto/evp/evp_err.c | |
| parent | 1b495200436b57309ca958a7a72affaf75171c1a (diff) | |
property: Move global default properties to the library context.
Fixes a problem where global properties don't work with a NULL query.
Specifying an algorithm with a NULL query ignores the default properties.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12123)
Diffstat (limited to 'crypto/evp/evp_err.c')
| -rw-r--r-- | crypto/evp/evp_err.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index 0908b1ca16..3dba7f2931 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -44,6 +44,8 @@ static const ERR_STRING_DATA EVP_str_reasons[] = { {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH), "data not multiple of block length"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DECODE_ERROR), "decode error"}, + {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DEFAULT_QUERY_PARSE_ERROR), + "default query parse error"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_KEY_TYPES), "different key types"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_PARAMETERS), |