summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-05-02 10:48:59 +0200
committerShane Lontis <shane.lontis@oracle.com>2020-05-03 06:26:30 +0200
commit200e5ee5a4493906b307bf23117630b7caff0694 (patch)
tree4635d045517ba2af31656c746290bf8652959c49 /crypto
parentutil/perl/OpenSSL/OID.pm: remove the included unit test (diff)
downloadopenssl-200e5ee5a4493906b307bf23117630b7caff0694.tar.xz
openssl-200e5ee5a4493906b307bf23117630b7caff0694.zip
Fix reason code clash
EVP_R_NULL_MAC_PKEY_CTX vs EVP_R_SET_DEFAULT_PROPERTY_FAILURE Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/11708)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/err/openssl.txt2
1 files changed, 1 insertions, 1 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