The branch master has been updated via 200e5ee5a4493906b307bf23117630b7caff0694 (commit) from 6d81bb2676f6a210f15f17324ab6852f52cc7f55 (commit)
- Log ----------------------------------------------------------------- commit 200e5ee5a4493906b307bf23117630b7caff0694 Author: Richard Levitte <levi...@openssl.org> Date: Sat May 2 10:48:59 2020 +0200 Fix reason code clash EVP_R_NULL_MAC_PKEY_CTX vs EVP_R_SET_DEFAULT_PROPERTY_FAILURE Reviewed-by: Shane Lontis <shane.lon...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/11708) ----------------------------------------------------------------------- Summary of changes: crypto/err/openssl.txt | 2 +- include/openssl/evperr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 9eeb9c8008..133a935b0f 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -2572,7 +2572,7 @@ EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED:179:\ EVP_R_PRIVATE_KEY_DECODE_ERROR:145:private key decode error EVP_R_PRIVATE_KEY_ENCODE_ERROR:146:private key encode error EVP_R_PUBLIC_KEY_NOT_RSA:106:public key not rsa -EVP_R_SET_DEFAULT_PROPERTY_FAILURE:208:set default property failure +EVP_R_SET_DEFAULT_PROPERTY_FAILURE:209:set default property failure EVP_R_TOO_MANY_RECORDS:183:too many records EVP_R_UNKNOWN_CIPHER:160:unknown cipher EVP_R_UNKNOWN_DIGEST:161:unknown digest diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index 61848bbc0c..a18b30e497 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -235,7 +235,7 @@ int ERR_load_EVP_strings(void); # define EVP_R_PRIVATE_KEY_DECODE_ERROR 145 # define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146 # define EVP_R_PUBLIC_KEY_NOT_RSA 106 -# define EVP_R_SET_DEFAULT_PROPERTY_FAILURE 208 +# define EVP_R_SET_DEFAULT_PROPERTY_FAILURE 209 # define EVP_R_TOO_MANY_RECORDS 183 # define EVP_R_UNKNOWN_CIPHER 160 # define EVP_R_UNKNOWN_DIGEST 161