summaryrefslogtreecommitdiff
path: root/crypto/err
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-11-10 13:07:46 +0100
committerRichard Levitte <levitte@openssl.org>2019-11-12 13:30:35 +0100
commit4d301427a96010468da2bb67bf1025fa8d886ab9 (patch)
tree48d9d375970cb7c7c056a814c4066ada8c1491cc /crypto/err
parent905b097fd586ed0279aee05b5961224212014ec9 (diff)
downloadopenssl-new-4d301427a96010468da2bb67bf1025fa8d886ab9.tar.gz
Make sure KDF reason codes are conserved in their current state
Because KDF errors are deprecated and only conserved for backward compatibilty, we must make sure that they remain untouched. A simple way to signal that is by modifying crypto/err/openssl.ec and replace the main header file (include/openssl/kdf.h in this case) with 'NONE', while retaining the error table file (crypto/kdf/kdf_err.c). util/mkerr.pl is modified to silently ignore anything surrounding a conserved lib when such a .ec line is found. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/10368)
Diffstat (limited to 'crypto/err')
-rw-r--r--crypto/err/openssl.ec2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 65633717ee..211edd42f3 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -34,7 +34,7 @@ L CRMF include/openssl/crmf.h crypto/crmf/crmf_err.c
L CMP include/openssl/cmp.h crypto/cmp/cmp_err.c
L CT include/openssl/ct.h crypto/ct/ct_err.c
L ASYNC include/openssl/async.h crypto/async/async_err.c
-L KDF include/openssl/kdf.h crypto/kdf/kdf_err.c
+L KDF NONE crypto/kdf/kdf_err.c
L SM2 include/crypto/sm2.h crypto/sm2/sm2_err.c
L OSSL_STORE include/openssl/store.h crypto/store/store_err.c
L ESS include/openssl/ess.h crypto/ess/ess_err.c