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:27:32 +0100 |
| commit | 3bf0c3fe31d5339524dae671064cc5fe9e4bda38 (patch) | |
| tree | df10b756d0183bb309ad42462ca97c9244cc7c26 /include | |
| parent | 7203c94e98c9fa76b0859c25b723b2bde4a9059b (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)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evperr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index a870e438dd..ff46657ef0 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -154,7 +154,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_ASN1_METHOD_ALREADY_REGISTERED 179 +# define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 179 # define EVP_R_PRIVATE_KEY_DECODE_ERROR 145 # define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146 # define EVP_R_PUBLIC_KEY_NOT_RSA 106 |