diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-01-15 01:04:37 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-01-17 08:59:41 +0100 |
| commit | e4a1d0230016d090ba78bc7092384315f85b0e72 (patch) | |
| tree | 518e1155d0185622e42d10918b9b0ca9a2317c3a /crypto/core_namemap.c | |
| parent | 9bb3e5fd87905e3e9f5f7edcc2e22d98360510ab (diff) | |
Modify EVP_CIPHER_is_a() and EVP_MD_is_a() to handle legacy methods too
These functions would only handle provided methods, but there are
cases where the caller just passes along a received method without
knowing the underlying method tech, so might pass along a legacy
method. We therefore need to have them handle this case as well so
they don't cause any unnecessary surprises.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10845)
Diffstat (limited to 'crypto/core_namemap.c')
| -rw-r--r-- | crypto/core_namemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c index 9a9d1a5748..4723604ee3 100644 --- a/crypto/core_namemap.c +++ b/crypto/core_namemap.c @@ -294,7 +294,7 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number, if (number == 0) { number = this_number; } else if (this_number != number) { - ERR_raise_data(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR, + ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR, "Got number %d when expecting %d", this_number, number); return 0; |