diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-22 19:03:37 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-01-23 20:30:37 +0100 |
| commit | 38454902208c358ffaa140aef3077c2316f82b19 (patch) | |
| tree | e40a4fd399908bb32489064d65d981e22447b373 /include | |
| parent | 3833ebea433dbb062fbdb69d300c5528b611a83a (diff) | |
Have EVP_PKEY_asn1_find_str() work more like EVP_PKEY_asn1_find()
EVP_PKEY_asn1_find_str() would search through standard asn1 methods
first, then those added by the application, which EVP_PKEY_asn1_find()
worked the other way around. Also, EVP_PKEY_asn1_find_str() didn't
handle aliases.
This change brings EVP_PKEY_asn1_find_str() closer to EVP_PKEY_asn1_find().
Fixes #5086
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5137)
(cherry picked from commit 3bf0c3fe31d5339524dae671064cc5fe9e4bda38)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index d2709eaedc..b7edb529e8 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1570,6 +1570,7 @@ int ERR_load_EVP_strings(void); # define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150 # define EVP_R_OPERATON_NOT_INITIALIZED 151 # define EVP_R_PARTIALLY_OVERLAPPING 162 +# define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 175 # define EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED 164 # define EVP_R_PRIVATE_KEY_DECODE_ERROR 145 # define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146 |