summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypto/asn1/asn1_err.c3
-rw-r--r--crypto/async/async_err.c5
-rw-r--r--crypto/bio/bio_err.c3
-rw-r--r--crypto/bn/bn_err.c5
-rw-r--r--crypto/buffer/buf_err.c5
-rw-r--r--crypto/cmp/cmp_err.c16
-rw-r--r--crypto/cms/cms_err.c16
-rw-r--r--crypto/comp/comp_err.c18
-rw-r--r--crypto/conf/conf_err.c3
-rw-r--r--crypto/cpt_err.c3
-rw-r--r--crypto/crmf/crmf_err.c16
-rw-r--r--crypto/ct/ct_err.c18
-rw-r--r--crypto/dh/dh_err.c16
-rw-r--r--crypto/dsa/dsa_err.c16
-rw-r--r--crypto/dso/dso_err.c4
-rw-r--r--crypto/ec/ec_err.c16
-rw-r--r--crypto/encode_decode/decoder_err.c5
-rw-r--r--crypto/encode_decode/encoder_err.c3
-rw-r--r--crypto/engine/eng_err.c18
-rw-r--r--crypto/err/openssl.txt28
-rw-r--r--crypto/ess/ess_err.c3
-rw-r--r--crypto/evp/evp_err.c3
-rw-r--r--crypto/http/http_err.c3
-rw-r--r--crypto/objects/obj_err.c3
-rw-r--r--crypto/ocsp/ocsp_err.c16
-rw-r--r--crypto/pem/pem_err.c3
-rw-r--r--crypto/pkcs12/pk12err.c3
-rw-r--r--crypto/pkcs7/pkcs7err.c5
-rw-r--r--crypto/property/property_err.c4
-rw-r--r--crypto/rand/rand_err.c3
-rw-r--r--crypto/rsa/rsa_err.c3
-rw-r--r--crypto/sm2/sm2_err.c15
-rw-r--r--crypto/store/store_err.c3
-rw-r--r--crypto/ts/ts_err.c18
-rw-r--r--crypto/ui/ui_err.c5
-rw-r--r--crypto/x509/v3err.c7
-rw-r--r--crypto/x509/x509_err.c3
-rw-r--r--engines/e_afalg.txt2
-rw-r--r--engines/e_afalg_err.c2
-rw-r--r--engines/e_afalg_err.h7
-rw-r--r--engines/e_capi.txt2
-rw-r--r--engines/e_capi_err.c2
-rw-r--r--engines/e_capi_err.h7
-rw-r--r--engines/e_dasync.txt2
-rw-r--r--engines/e_dasync_err.c2
-rw-r--r--engines/e_dasync_err.h7
-rw-r--r--engines/e_loader_attic_err.h4
-rw-r--r--engines/e_ossltest.txt2
-rw-r--r--engines/e_ossltest_err.c2
-rw-r--r--engines/e_ossltest_err.h7
-rw-r--r--include/crypto/asn1err.h27
-rw-r--r--include/crypto/asyncerr.h27
-rw-r--r--include/crypto/bioerr.h27
-rw-r--r--include/crypto/bnerr.h27
-rw-r--r--include/crypto/buffererr.h27
-rw-r--r--include/crypto/cmperr.h30
-rw-r--r--include/crypto/cmserr.h30
-rw-r--r--include/crypto/comperr.h30
-rw-r--r--include/crypto/conferr.h27
-rw-r--r--include/crypto/crmferr.h30
-rw-r--r--include/crypto/cryptoerr.h27
-rw-r--r--include/crypto/cterr.h30
-rw-r--r--include/crypto/decodererr.h27
-rw-r--r--include/crypto/dherr.h30
-rw-r--r--include/crypto/dsaerr.h30
-rw-r--r--include/crypto/ecerr.h30
-rw-r--r--include/crypto/encodererr.h27
-rw-r--r--include/crypto/engineerr.h30
-rw-r--r--include/crypto/esserr.h27
-rw-r--r--include/crypto/evperr.h27
-rw-r--r--include/crypto/httperr.h27
-rw-r--r--include/crypto/objectserr.h27
-rw-r--r--include/crypto/ocsperr.h30
-rw-r--r--include/crypto/pemerr.h27
-rw-r--r--include/crypto/pkcs12err.h27
-rw-r--r--include/crypto/pkcs7err.h27
-rw-r--r--include/crypto/randerr.h27
-rw-r--r--include/crypto/rsaerr.h27
-rw-r--r--include/crypto/sm2err.h25
-rw-r--r--include/crypto/storeerr.h27
-rw-r--r--include/crypto/tserr.h30
-rw-r--r--include/crypto/uierr.h27
-rw-r--r--include/crypto/x509err.h27
-rw-r--r--include/crypto/x509v3err.h27
-rw-r--r--include/internal/dsoerr.h13
-rw-r--r--include/internal/propertyerr.h13
-rw-r--r--include/openssl/asn1err.h5
-rw-r--r--include/openssl/asyncerr.h5
-rw-r--r--include/openssl/bioerr.h5
-rw-r--r--include/openssl/bnerr.h6
-rw-r--r--include/openssl/buffererr.h5
-rw-r--r--include/openssl/cmperr.h11
-rw-r--r--include/openssl/cmserr.h11
-rw-r--r--include/openssl/comperr.h11
-rw-r--r--include/openssl/conferr.h5
-rw-r--r--include/openssl/crmferr.h13
-rw-r--r--include/openssl/cryptoerr.h5
-rw-r--r--include/openssl/cterr.h11
-rw-r--r--include/openssl/decodererr.h11
-rw-r--r--include/openssl/dherr.h11
-rw-r--r--include/openssl/dsaerr.h11
-rw-r--r--include/openssl/ecerr.h11
-rw-r--r--include/openssl/encodererr.h9
-rw-r--r--include/openssl/engineerr.h11
-rw-r--r--include/openssl/esserr.h5
-rw-r--r--include/openssl/evperr.h7
-rw-r--r--include/openssl/httperr.h5
-rw-r--r--include/openssl/objectserr.h9
-rw-r--r--include/openssl/ocsperr.h11
-rw-r--r--include/openssl/pemerr.h9
-rw-r--r--include/openssl/pkcs12err.h5
-rw-r--r--include/openssl/pkcs7err.h5
-rw-r--r--include/openssl/randerr.h12
-rw-r--r--include/openssl/rsaerr.h5
-rw-r--r--include/openssl/sslerr.h5
-rw-r--r--include/openssl/storeerr.h9
-rw-r--r--include/openssl/tserr.h11
-rw-r--r--include/openssl/uierr.h5
-rw-r--r--include/openssl/x509err.h5
-rw-r--r--include/openssl/x509v3err.h7
-rw-r--r--providers/common/include/prov/providercommonerr.h16
-rw-r--r--providers/common/provider_err.c4
-rw-r--r--ssl/ssl_err.c3
-rw-r--r--ssl/sslerr.h27
124 files changed, 1286 insertions, 376 deletions
diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index 814cd91373..d202094e27 100644
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/asn1err.h>
+#include "crypto/asn1err.h"
#ifndef OPENSSL_NO_ERR
@@ -199,7 +200,7 @@ static const ERR_STRING_DATA ASN1_str_reasons[] = {
#endif
-int ERR_load_ASN1_strings(void)
+int err_load_ASN1_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(ASN1_str_reasons[0].error) == NULL)
diff --git a/crypto/async/async_err.c b/crypto/async/async_err.c
index 7a06f75265..285a0f2290 100644
--- a/crypto/async/async_err.c
+++ b/crypto/async/async_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/asyncerr.h>
+#include "crypto/asyncerr.h"
#ifndef OPENSSL_NO_ERR
@@ -26,7 +27,7 @@ static const ERR_STRING_DATA ASYNC_str_reasons[] = {
#endif
-int ERR_load_ASYNC_strings(void)
+int err_load_ASYNC_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(ASYNC_str_reasons[0].error) == NULL)
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index afeb67985e..08bf8dc98a 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/bioerr.h>
+#include "crypto/bioerr.h"
#ifndef OPENSSL_NO_ERR
@@ -76,7 +77,7 @@ static const ERR_STRING_DATA BIO_str_reasons[] = {
#endif
-int ERR_load_BIO_strings(void)
+int err_load_BIO_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(BIO_str_reasons[0].error) == NULL)
diff --git a/crypto/bn/bn_err.c b/crypto/bn/bn_err.c
index ce0ea3865d..e4ac23e1b6 100644
--- a/crypto/bn/bn_err.c
+++ b/crypto/bn/bn_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/bnerr.h>
+#include "crypto/bnerr.h"
#ifndef OPENSSL_NO_ERR
@@ -44,7 +45,7 @@ static const ERR_STRING_DATA BN_str_reasons[] = {
#endif
-int ERR_load_BN_strings(void)
+int err_load_BN_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(BN_str_reasons[0].error) == NULL)
diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 702707bb88..7eee54f321 100644
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/buffererr.h>
+#include "crypto/buffererr.h"
#ifndef OPENSSL_NO_ERR
@@ -19,7 +20,7 @@ static const ERR_STRING_DATA BUF_str_reasons[] = {
#endif
-int ERR_load_BUF_strings(void)
+int err_load_BUF_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(BUF_str_reasons[0].error) == NULL)
diff --git a/crypto/cmp/cmp_err.c b/crypto/cmp/cmp_err.c
index 260e8386d5..93aed38f9a 100644
--- a/crypto/cmp/cmp_err.c
+++ b/crypto/cmp/cmp_err.c
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/cmperr.h>
+#include "crypto/cmperr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_CMP
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CMP_str_reasons[] = {
{ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ALGORITHM_NOT_SUPPORTED),
@@ -155,13 +158,16 @@ static const ERR_STRING_DATA CMP_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_CMP_strings(void)
+int err_load_CMP_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CMP_str_reasons[0].error) == NULL)
ERR_load_strings_const(CMP_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/cms/cms_err.c b/crypto/cms/cms_err.c
index fdb2b7f5c8..173e1596f6 100644
--- a/crypto/cms/cms_err.c
+++ b/crypto/cms/cms_err.c
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/cmserr.h>
+#include "crypto/cmserr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_CMS
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CMS_str_reasons[] = {
{ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"},
@@ -160,13 +163,16 @@ static const ERR_STRING_DATA CMS_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_CMS_strings(void)
+int err_load_CMS_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CMS_str_reasons[0].error) == NULL)
ERR_load_strings_const(CMS_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c
index d4ae0406a3..972e75cdaf 100644
--- a/crypto/comp/comp_err.c
+++ b/crypto/comp/comp_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/comperr.h>
+#include "crypto/comperr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_COMP
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA COMP_str_reasons[] = {
{ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_DEFLATE_ERROR),
@@ -23,13 +26,16 @@ static const ERR_STRING_DATA COMP_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_COMP_strings(void)
+int err_load_COMP_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(COMP_str_reasons[0].error) == NULL)
ERR_load_strings_const(COMP_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
index 9c3c2d6878..417ae58efb 100644
--- a/crypto/conf/conf_err.c
+++ b/crypto/conf/conf_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/conferr.h>
+#include "crypto/conferr.h"
#ifndef OPENSSL_NO_ERR
@@ -60,7 +61,7 @@ static const ERR_STRING_DATA CONF_str_reasons[] = {
#endif
-int ERR_load_CONF_strings(void)
+int err_load_CONF_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CONF_str_reasons[0].error) == NULL)
diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index 04b6cdb27f..7aa5416720 100644
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/cryptoerr.h>
+#include "crypto/cryptoerr.h"
#ifndef OPENSSL_NO_ERR
@@ -57,7 +58,7 @@ static const ERR_STRING_DATA CRYPTO_str_reasons[] = {
#endif
-int ERR_load_CRYPTO_strings(void)
+int err_load_CRYPTO_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CRYPTO_str_reasons[0].error) == NULL)
diff --git a/crypto/crmf/crmf_err.c b/crypto/crmf/crmf_err.c
index 61a1488838..bc7e8558f9 100644
--- a/crypto/crmf/crmf_err.c
+++ b/crypto/crmf/crmf_err.c
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/crmferr.h>
+#include "crypto/crmferr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_CRMF
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CRMF_str_reasons[] = {
{ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_BAD_PBM_ITERATIONCOUNT),
@@ -56,13 +59,16 @@ static const ERR_STRING_DATA CRMF_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_CRMF_strings(void)
+int err_load_CRMF_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CRMF_str_reasons[0].error) == NULL)
ERR_load_strings_const(CRMF_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/ct/ct_err.c b/crypto/ct/ct_err.c
index f9b9b57b22..d067b713c1 100644
--- a/crypto/ct/ct_err.c
+++ b/crypto/ct/ct_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/cterr.h>
+#include "crypto/cterr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_CT
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA CT_str_reasons[] = {
{ERR_PACK(ERR_LIB_CT, 0, CT_R_BASE64_DECODE_ERROR), "base64 decode error"},
@@ -43,13 +46,16 @@ static const ERR_STRING_DATA CT_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_CT_strings(void)
+int err_load_CT_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(CT_str_reasons[0].error) == NULL)
ERR_load_strings_const(CT_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
index a8243ec987..00a3110964 100644
--- a/crypto/dh/dh_err.c
+++ b/crypto/dh/dh_err.c
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/dherr.h>
+#include "crypto/dherr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_DH
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA DH_str_reasons[] = {
{ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_FFC_PARAMETERS), "bad ffc parameters"},
@@ -56,13 +59,16 @@ static const ERR_STRING_DATA DH_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_DH_strings(void)
+int err_load_DH_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(DH_str_reasons[0].error) == NULL)
ERR_load_strings_const(DH_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index 6bf7accacf..99fc0e80fb 100644
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/dsaerr.h>
+#include "crypto/dsaerr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_DSA
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA DSA_str_reasons[] = {
{ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_FFC_PARAMETERS), "bad ffc parameters"},
@@ -35,13 +38,16 @@ static const ERR_STRING_DATA DSA_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_DSA_strings(void)
+int err_load_DSA_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(DSA_str_reasons[0].error) == NULL)
ERR_load_strings_const(DSA_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index 8a4d9a812a..c018a16464 100644
--- a/crypto/dso/dso_err.c
+++ b/crypto/dso/dso_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -46,7 +46,7 @@ static const ERR_STRING_DATA DSO_str_reasons[] = {
#endif
-int ERR_load_DSO_strings(void)
+int err_load_DSO_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(DSO_str_reasons[0].error) == NULL)
diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
index 35cf7d158f..108df5695b 100644
--- a/crypto/ec/ec_err.c
+++ b/crypto/ec/ec_err.c
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/ecerr.h>
+#include "crypto/ecerr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_EC
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA EC_str_reasons[] = {
{ERR_PACK(ERR_LIB_EC, 0, EC_R_ASN1_ERROR), "asn1 error"},
@@ -114,13 +117,16 @@ static const ERR_STRING_DATA EC_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_EC_strings(void)
+int err_load_EC_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(EC_str_reasons[0].error) == NULL)
ERR_load_strings_const(EC_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/encode_decode/decoder_err.c b/crypto/encode_decode/decoder_err.c
index 984f7abeb9..cf68a4c7c5 100644
--- a/crypto/encode_decode/decoder_err.c
+++ b/crypto/encode_decode/decoder_err.c
@@ -10,18 +10,19 @@
#include <openssl/err.h>
#include <openssl/decodererr.h>
+#include "crypto/decodererr.h"
#ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA OSSL_DECODER_str_reasons[] = {
{ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_MISSING_GET_PARAMS),
- "missing get params"},
+ "missing get params"},
{0, NULL}
};
#endif
-int ERR_load_OSSL_DECODER_strings(void)
+int err_load_OSSL_DECODER_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(OSSL_DECODER_str_reasons[0].error) == NULL)
diff --git a/crypto/encode_decode/encoder_err.c b/crypto/encode_decode/encoder_err.c
index 2c95a2a20e..0b5028769d 100644
--- a/crypto/encode_decode/encoder_err.c
+++ b/crypto/encode_decode/encoder_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/encodererr.h>
+#include "crypto/encodererr.h"
#ifndef OPENSSL_NO_ERR
@@ -25,7 +26,7 @@ static const ERR_STRING_DATA OSSL_ENCODER_str_reasons[] = {
#endif
-int ERR_load_OSSL_ENCODER_strings(void)
+int err_load_OSSL_ENCODER_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(OSSL_ENCODER_str_reasons[0].error) == NULL)
diff --git a/crypto/engine/eng_err.c b/crypto/engine/eng_err.c
index c602e0ffe7..1cea06be08 100644
--- a/crypto/engine/eng_err.c
+++ b/crypto/engine/eng_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/engineerr.h>
+#include "crypto/engineerr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ENGINE
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA ENGINE_str_reasons[] = {
{ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ALREADY_LOADED), "already loaded"},
@@ -76,13 +79,16 @@ static const ERR_STRING_DATA ENGINE_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_ENGINE_strings(void)
+int err_load_ENGINE_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(ENGINE_str_reasons[0].error) == NULL)
ERR_load_strings_const(ENGINE_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index d8ea2a333f..ca10840cee 100644
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -2658,34 +2658,6 @@ HTTP_R_STATUS_CODE_UNSUPPORTED:114:status code unsupported
HTTP_R_TLS_NOT_ENABLED:107:tls not enabled
HTTP_R_TOO_MANY_REDIRECTIONS:115:too many redirections
HTTP_R_UNEXPECTED_CONTENT_TYPE:118:unexpected content type
-KDF_R_BAD_ENCODING:122:bad encoding
-KDF_R_BAD_LENGTH:123:bad length
-KDF_R_BOTH_MODE_AND_MODE_INT:127:both mode and mode int
-KDF_R_INVALID_DIGEST:100:invalid digest
-KDF_R_INVALID_ITERATION_COUNT:119:invalid iteration count
-KDF_R_INVALID_KEY_LEN:120:invalid key len
-KDF_R_INVALID_MAC_TYPE:116:invalid mac type
-KDF_R_INVALID_MODE:128:invalid mode
-KDF_R_INVALID_MODE_INT:129:invalid mode int
-KDF_R_MISSING_CEK_ALG:125:missing cek alg
-KDF_R_MISSING_ITERATION_COUNT:109:missing iteration count
-KDF_R_MISSING_KEY:104:missing key
-KDF_R_MISSING_MESSAGE_DIGEST:105:missing message digest
-KDF_R_MISSING_PARAMETER:101:missing parameter
-KDF_R_MISSING_PASS:110:missing pass
-KDF_R_MISSING_SALT:111:missing salt
-KDF_R_MISSING_SECRET:107:missing secret
-KDF_R_MISSING_SEED:106:missing seed
-KDF_R_MISSING_SESSION_ID:113:missing session id
-KDF_R_MISSING_TYPE:114:missing type
-KDF_R_MISSING_XCGHASH:115:missing xcghash
-KDF_R_NOT_SUPPORTED:118:not supported
-KDF_R_UNKNOWN_PARAMETER_TYPE:103:unknown parameter type
-KDF_R_UNSUPPORTED_CEK_ALG:126:unsupported cek alg
-KDF_R_UNSUPPORTED_MAC_TYPE:117:unsupported mac type
-KDF_R_VALUE_ERROR:108:value error
-KDF_R_VALUE_MISSING:102:value missing
-KDF_R_WRONG_OUTPUT_BUFFER_SIZE:112:wrong output buffer size
OBJ_R_OID_EXISTS:102:oid exists
OBJ_R_UNKNOWN_NID:101:unknown nid
OBJ_R_UNKNOWN_OBJECT_NAME:103:unknown object name
diff --git a/crypto/ess/ess_err.c b/crypto/ess/ess_err.c
index 6547645fea..450c07edac 100644
--- a/crypto/ess/ess_err.c
+++ b/crypto/ess/ess_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/esserr.h>
+#include "crypto/esserr.h"
#ifndef OPENSSL_NO_ERR
@@ -25,7 +26,7 @@ static const ERR_STRING_DATA ESS_str_reasons[] = {
#endif
-int ERR_load_ESS_strings(void)
+int err_load_ESS_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(ESS_str_reasons[0].error) == NULL)
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index 52a224a517..3a4253b353 100644
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/evperr.h>
+#include "crypto/evperr.h"
#ifndef OPENSSL_NO_ERR
@@ -196,7 +197,7 @@ static const ERR_STRING_DATA EVP_str_reasons[] = {
#endif
-int ERR_load_EVP_strings(void)
+int err_load_EVP_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(EVP_str_reasons[0].error) == NULL)
diff --git a/crypto/http/http_err.c b/crypto/http/http_err.c
index 13779fac84..ec46fb9304 100644
--- a/crypto/http/http_err.c
+++ b/crypto/http/http_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/httperr.h>
+#include "crypto/httperr.h"
#ifndef OPENSSL_NO_ERR
@@ -64,7 +65,7 @@ static const ERR_STRING_DATA HTTP_str_reasons[] = {
#endif
-int ERR_load_HTTP_strings(void)
+int err_load_HTTP_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(HTTP_str_reasons[0].error) == NULL)
diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c
index c55e8ef2d0..ebc46cb44c 100644
--- a/crypto/objects/obj_err.c
+++ b/crypto/objects/obj_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/objectserr.h>
+#include "crypto/objectserr.h"
#ifndef OPENSSL_NO_ERR
@@ -23,7 +24,7 @@ static const ERR_STRING_DATA OBJ_str_reasons[] = {
#endif
-int ERR_load_OBJ_strings(void)
+int err_load_OBJ_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(OBJ_str_reasons[0].error) == NULL)
diff --git a/crypto/ocsp/ocsp_err.c b/crypto/ocsp/ocsp_err.c
index 518e0432a3..fd0643c715 100644
--- a/crypto/ocsp/ocsp_err.c
+++ b/crypto/ocsp/ocsp_err.c
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/ocsperr.h>
+#include "crypto/ocsperr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_OCSP
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA OCSP_str_reasons[] = {
{ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_CERTIFICATE_VERIFY_ERROR),
@@ -57,13 +60,16 @@ static const ERR_STRING_DATA OCSP_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_OCSP_strings(void)
+int err_load_OCSP_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(OCSP_str_reasons[0].error) == NULL)
ERR_load_strings_const(OCSP_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/pem/pem_err.c b/crypto/pem/pem_err.c
index 132b15cb37..52a1bc611f 100644
--- a/crypto/pem/pem_err.c
+++ b/crypto/pem/pem_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/pemerr.h>
+#include "crypto/pemerr.h"
#ifndef OPENSSL_NO_ERR
@@ -59,7 +60,7 @@ static const ERR_STRING_DATA PEM_str_reasons[] = {
#endif
-int ERR_load_PEM_strings(void)
+int err_load_PEM_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(PEM_str_reasons[0].error) == NULL)
diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
index ae835c57be..9899e272c1 100644
--- a/crypto/pkcs12/pk12err.c
+++ b/crypto/pkcs12/pk12err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/pkcs12err.h>
+#include "crypto/pkcs12err.h"
#ifndef OPENSSL_NO_ERR
@@ -50,7 +51,7 @@ static const ERR_STRING_DATA PKCS12_str_reasons[] = {
#endif
-int ERR_load_PKCS12_strings(void)
+int err_load_PKCS12_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(PKCS12_str_reasons[0].error) == NULL)
diff --git a/crypto/pkcs7/pkcs7err.c b/crypto/pkcs7/pkcs7err.c
index f7b87d552a..c2c40b48af 100644
--- a/crypto/pkcs7/pkcs7err.c
+++ b/crypto/pkcs7/pkcs7err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/pkcs7err.h>
+#include "crypto/pkcs7err.h"
#ifndef OPENSSL_NO_ERR
@@ -87,7 +88,7 @@ static const ERR_STRING_DATA PKCS7_str_reasons[] = {
#endif
-int ERR_load_PKCS7_strings(void)
+int err_load_PKCS7_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(PKCS7_str_reasons[0].error) == NULL)
diff --git a/crypto/property/property_err.c b/crypto/property/property_err.c
index 5f81930190..a7c722feb5 100644
--- a/crypto/property/property_err.c
+++ b/crypto/property/property_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -36,7 +36,7 @@ static const ERR_STRING_DATA PROP_str_reasons[] = {
#endif
-int ERR_load_PROP_strings(void)
+int err_load_PROP_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(PROP_str_reasons[0].error) == NULL)
diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c
index be8726192b..32c4c6cbcb 100644
--- a/crypto/rand/rand_err.c
+++ b/crypto/rand/rand_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/randerr.h>
+#include "crypto/randerr.h"
#ifndef OPENSSL_NO_ERR
@@ -98,7 +99,7 @@ static const ERR_STRING_DATA RAND_str_reasons[] = {
#endif
-int ERR_load_RAND_strings(void)
+int err_load_RAND_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(RAND_str_reasons[0].error) == NULL)
diff --git a/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c
index 382b8cb7d1..8008092b13 100644
--- a/crypto/rsa/rsa_err.c
+++ b/crypto/rsa/rsa_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/rsaerr.h>
+#include "crypto/rsaerr.h"
#ifndef OPENSSL_NO_ERR
@@ -152,7 +153,7 @@ static const ERR_STRING_DATA RSA_str_reasons[] = {
#endif
-int ERR_load_RSA_strings(void)
+int err_load_RSA_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(RSA_str_reasons[0].error) == NULL)
diff --git a/crypto/sm2/sm2_err.c b/crypto/sm2/sm2_err.c
index 387b2f4cff..60509e14d1 100644
--- a/crypto/sm2/sm2_err.c
+++ b/crypto/sm2/sm2_err.c
@@ -11,7 +11,9 @@
#include <openssl/err.h>
#include "crypto/sm2err.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_SM2
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA SM2_str_reasons[] = {
{ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ASN1_ERROR), "asn1 error"},
@@ -31,13 +33,16 @@ static const ERR_STRING_DATA SM2_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_SM2_strings(void)
+int err_load_SM2_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(SM2_str_reasons[0].error) == NULL)
ERR_load_strings_const(SM2_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/store/store_err.c b/crypto/store/store_err.c
index 320934e6c6..ab0a2c6cd2 100644
--- a/crypto/store/store_err.c
+++ b/crypto/store/store_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/storeerr.h>
+#include "crypto/storeerr.h"
#ifndef OPENSSL_NO_ERR
@@ -62,7 +63,7 @@ static const ERR_STRING_DATA OSSL_STORE_str_reasons[] = {
#endif
-int ERR_load_OSSL_STORE_strings(void)
+int err_load_OSSL_STORE_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(OSSL_STORE_str_reasons[0].error) == NULL)
diff --git a/crypto/ts/ts_err.c b/crypto/ts/ts_err.c
index e87c492686..3a682c694f 100644
--- a/crypto/ts/ts_err.c
+++ b/crypto/ts/ts_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,8 +10,11 @@
#include <openssl/err.h>
#include <openssl/tserr.h>
+#include "crypto/tserr.h"
-#ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_TS
+
+# ifndef OPENSSL_NO_ERR
static const ERR_STRING_DATA TS_str_reasons[] = {
{ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type"},
@@ -73,13 +76,16 @@ static const ERR_STRING_DATA TS_str_reasons[] = {
{0, NULL}
};
-#endif
+# endif
-int ERR_load_TS_strings(void)
+int err_load_TS_strings_int(void)
{
-#ifndef OPENSSL_NO_ERR
+# ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(TS_str_reasons[0].error) == NULL)
ERR_load_strings_const(TS_str_reasons);
-#endif
+# endif
return 1;
}
+#else
+NON_EMPTY_TRANSLATION_UNIT
+#endif
diff --git a/crypto/ui/ui_err.c b/crypto/ui/ui_err.c
index 2b564f71be..83ea371997 100644
--- a/crypto/ui/ui_err.c
+++ b/crypto/ui/ui_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/uierr.h>
+#include "crypto/uierr.h"
#ifndef OPENSSL_NO_ERR
@@ -36,7 +37,7 @@ static const ERR_STRING_DATA UI_str_reasons[] = {
#endif
-int ERR_load_UI_strings(void)
+int err_load_UI_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(UI_str_reasons[0].error) == NULL)
diff --git a/crypto/x509/v3err.c b/crypto/x509/v3err.c
index 5124908089..18eb9917cb 100644
--- a/crypto/x509/v3err.c
+++ b/crypto/x509/v3err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/x509v3err.h>
+#include "crypto/x509v3err.h"
#ifndef OPENSSL_NO_ERR
@@ -54,6 +55,8 @@ static const ERR_STRING_DATA X509V3_str_reasons[] = {
"invalid boolean string"},
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_CERTIFICATE),
"invalid certificate"},
+ {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EMPTY_NAME),
+ "invalid empty name"},
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EXTENSION_STRING),
"invalid extension string"},
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_INHERITANCE),
@@ -65,8 +68,6 @@ static const ERR_STRING_DATA X509V3_str_reasons[] = {
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NAME), "invalid name"},
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_ARGUMENT),
"invalid null argument"},
- {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EMPTY_NAME),
- "invalid empty name"},
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_VALUE),
"invalid null value"},
{ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBER), "invalid number"},
@@ -136,7 +137,7 @@ static const ERR_STRING_DATA X509V3_str_reasons[] = {
#endif
-int ERR_load_X509V3_strings(void)
+int err_load_X509V3_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(X509V3_str_reasons[0].error) == NULL)
diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index 330fed3406..76d57e869c 100644
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/x509err.h>
+#include "crypto/x509err.h"
#ifndef OPENSSL_NO_ERR
@@ -83,7 +84,7 @@ static const ERR_STRING_DATA X509_str_reasons[] = {
#endif
-int ERR_load_X509_strings(void)
+int err_load_X509_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(X509_str_reasons[0].error) == NULL)
diff --git a/engines/e_afalg.txt b/engines/e_afalg.txt
index 7de1fe9826..70d2d8b819 100644
--- a/engines/e_afalg.txt
+++ b/engines/e_afalg.txt
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
diff --git a/engines/e_afalg_err.c b/engines/e_afalg_err.c
index 4db6d660c9..cc365064ef 100644
--- a/engines/e_afalg_err.c
+++ b/engines/e_afalg_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/engines/e_afalg_err.h b/engines/e_afalg_err.h
index 557df5d401..08f2d54da5 100644
--- a/engines/e_afalg_err.h
+++ b/engines/e_afalg_err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -8,8 +8,9 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OSSL_ENGINES_E_AFALG_ERR_H
-# define OSSL_ENGINES_E_AFALG_ERR_H
+#ifndef OSSL_E_AFALG_ERR_H
+# define OSSL_E_AFALG_ERR_H
+# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
diff --git a/engines/e_capi.txt b/engines/e_capi.txt
index 303a1ed52f..942a6d9769 100644
--- a/engines/e_capi.txt
+++ b/engines/e_capi.txt
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
diff --git a/engines/e_capi_err.c b/engines/e_capi_err.c
index e2b1f7561f..12eb8e0a89 100644
--- a/engines/e_capi_err.c
+++ b/engines/e_capi_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h
index c8bd24869a..d075373755 100644
--- a/engines/e_capi_err.h
+++ b/engines/e_capi_err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -8,8 +8,9 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OSSL_ENGINES_E_CAPI_ERR_H
-# define OSSL_ENGINES_E_CAPI_ERR_H
+#ifndef OSSL_E_CAPI_ERR_H
+# define OSSL_E_CAPI_ERR_H
+# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
diff --git a/engines/e_dasync.txt b/engines/e_dasync.txt
index 819ff6fefe..c503a7a667 100644
--- a/engines/e_dasync.txt
+++ b/engines/e_dasync.txt
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
diff --git a/engines/e_dasync_err.c b/engines/e_dasync_err.c
index a2e6c0dc86..1ee237a54d 100644
--- a/engines/e_dasync_err.c
+++ b/engines/e_dasync_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h
index 7d2ea7936f..71c8d9916d 100644
--- a/engines/e_dasync_err.h
+++ b/engines/e_dasync_err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -8,8 +8,9 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OSSL_ENGINES_E_DASYNC_ERR_H
-# define OSSL_ENGINES_E_DASYNC_ERR_H
+#ifndef OSSL_E_DASYNC_ERR_H
+# define OSSL_E_DASYNC_ERR_H
+# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
diff --git a/engines/e_loader_attic_err.h b/engines/e_loader_attic_err.h
index 115e0ea6f6..6f30ae3d0c 100644
--- a/engines/e_loader_attic_err.h
+++ b/engines/e_loader_attic_err.h
@@ -8,8 +8,8 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OPENSSL_ATTICERR_H
-# define OPENSSL_ATTICERR_H
+#ifndef OSSL_E_LOADER_ATTIC_ERR_H
+# define OSSL_E_LOADER_ATTIC_ERR_H
# pragma once
# include <openssl/opensslconf.h>
diff --git a/engines/e_ossltest.txt b/engines/e_ossltest.txt
index f40e60cf21..ab36940699 100644
--- a/engines/e_ossltest.txt
+++ b/engines/e_ossltest.txt
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
diff --git a/engines/e_ossltest_err.c b/engines/e_ossltest_err.c
index d9ee80cb83..141fcd1ca9 100644
--- a/engines/e_ossltest_err.c
+++ b/engines/e_ossltest_err.c
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
diff --git a/engines/e_ossltest_err.h b/engines/e_ossltest_err.h
index 0c23b0c453..1405a30af8 100644
--- a/engines/e_ossltest_err.h
+++ b/engines/e_ossltest_err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -8,8 +8,9 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OSSL_ENGINES_E_OSSLTEST_ERR_H
-# define OSSL_ENGINES_E_OSSLTEST_ERR_H
+#ifndef OSSL_E_OSSLTEST_ERR_H
+# define OSSL_E_OSSLTEST_ERR_H
+# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
diff --git a/include/crypto/asn1err.h b/include/crypto/asn1err.h
new file mode 100644
index 0000000000..afd05297a2
--- /dev/null
+++ b/include/crypto/asn1err.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_ASN1ERR_H
+# define OSSL_CRYPTO_ASN1ERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_ASN1_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/asyncerr.h b/include/crypto/asyncerr.h
new file mode 100644
index 0000000000..71a6ddc59a
--- /dev/null
+++ b/include/crypto/asyncerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_ASYNCERR_H
+# define OSSL_CRYPTO_ASYNCERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_ASYNC_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/bioerr.h b/include/crypto/bioerr.h
new file mode 100644
index 0000000000..3cc57cb281
--- /dev/null
+++ b/include/crypto/bioerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_BIOERR_H
+# define OSSL_CRYPTO_BIOERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_BIO_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/bnerr.h b/include/crypto/bnerr.h
new file mode 100644
index 0000000000..7407a66ab5
--- /dev/null
+++ b/include/crypto/bnerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_BNERR_H
+# define OSSL_CRYPTO_BNERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_BN_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/buffererr.h b/include/crypto/buffererr.h
new file mode 100644
index 0000000000..93ea0dea4b
--- /dev/null
+++ b/include/crypto/buffererr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_BUFFERERR_H
+# define OSSL_CRYPTO_BUFFERERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_BUF_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/cmperr.h b/include/crypto/cmperr.h
new file mode 100644
index 0000000000..92dd4154bb
--- /dev/null
+++ b/include/crypto/cmperr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_CMPERR_H
+# define OSSL_CRYPTO_CMPERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_CMP
+
+int err_load_CMP_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/cmserr.h b/include/crypto/cmserr.h
new file mode 100644
index 0000000000..2aad1e1e0c
--- /dev/null
+++ b/include/crypto/cmserr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_CMSERR_H
+# define OSSL_CRYPTO_CMSERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_CMS
+
+int err_load_CMS_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/comperr.h b/include/crypto/comperr.h
new file mode 100644
index 0000000000..8b8253cf22
--- /dev/null
+++ b/include/crypto/comperr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_COMPERR_H
+# define OSSL_CRYPTO_COMPERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_COMP
+
+int err_load_COMP_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/conferr.h b/include/crypto/conferr.h
new file mode 100644
index 0000000000..af35d85a7e
--- /dev/null
+++ b/include/crypto/conferr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_CONFERR_H
+# define OSSL_CRYPTO_CONFERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_CONF_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/crmferr.h b/include/crypto/crmferr.h
new file mode 100644
index 0000000000..fa86a6f006
--- /dev/null
+++ b/include/crypto/crmferr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_CRMFERR_H
+# define OSSL_CRYPTO_CRMFERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_CRMF
+
+int err_load_CRMF_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/cryptoerr.h b/include/crypto/cryptoerr.h
new file mode 100644
index 0000000000..419ca1aac1
--- /dev/null
+++ b/include/crypto/cryptoerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_CRYPTOERR_H
+# define OSSL_CRYPTO_CRYPTOERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_CRYPTO_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/cterr.h b/include/crypto/cterr.h
new file mode 100644
index 0000000000..3860508cdf
--- /dev/null
+++ b/include/crypto/cterr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_CTERR_H
+# define OSSL_CRYPTO_CTERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_CT
+
+int err_load_CT_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/decodererr.h b/include/crypto/decodererr.h
new file mode 100644
index 0000000000..f4f8b97cf6
--- /dev/null
+++ b/include/crypto/decodererr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_DECODERERR_H
+# define OSSL_CRYPTO_DECODERERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_OSSL_DECODER_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/dherr.h b/include/crypto/dherr.h
new file mode 100644
index 0000000000..93de53d2bc
--- /dev/null
+++ b/include/crypto/dherr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_DHERR_H
+# define OSSL_CRYPTO_DHERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_DH
+
+int err_load_DH_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/dsaerr.h b/include/crypto/dsaerr.h
new file mode 100644
index 0000000000..be4bbb0d60
--- /dev/null
+++ b/include/crypto/dsaerr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_DSAERR_H
+# define OSSL_CRYPTO_DSAERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_DSA
+
+int err_load_DSA_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/ecerr.h b/include/crypto/ecerr.h
new file mode 100644
index 0000000000..ccf64fd248
--- /dev/null
+++ b/include/crypto/ecerr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_ECERR_H
+# define OSSL_CRYPTO_ECERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_EC
+
+int err_load_EC_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/encodererr.h b/include/crypto/encodererr.h
new file mode 100644
index 0000000000..656c033245
--- /dev/null
+++ b/include/crypto/encodererr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_ENCODERERR_H
+# define OSSL_CRYPTO_ENCODERERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_OSSL_ENCODER_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/engineerr.h b/include/crypto/engineerr.h
new file mode 100644
index 0000000000..ce29b9aab7
--- /dev/null
+++ b/include/crypto/engineerr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_ENGINEERR_H
+# define OSSL_CRYPTO_ENGINEERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_ENGINE
+
+int err_load_ENGINE_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/esserr.h b/include/crypto/esserr.h
new file mode 100644
index 0000000000..91657e6e0b
--- /dev/null
+++ b/include/crypto/esserr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_ESSERR_H
+# define OSSL_CRYPTO_ESSERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_ESS_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/evperr.h b/include/crypto/evperr.h
new file mode 100644
index 0000000000..2bfc71ad3c
--- /dev/null
+++ b/include/crypto/evperr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_EVPERR_H
+# define OSSL_CRYPTO_EVPERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_EVP_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/httperr.h b/include/crypto/httperr.h
new file mode 100644
index 0000000000..017d01da7d
--- /dev/null
+++ b/include/crypto/httperr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_HTTPERR_H
+# define OSSL_CRYPTO_HTTPERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_HTTP_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/objectserr.h b/include/crypto/objectserr.h
new file mode 100644
index 0000000000..1e0e58af25
--- /dev/null
+++ b/include/crypto/objectserr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_OBJECTSERR_H
+# define OSSL_CRYPTO_OBJECTSERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_OBJ_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/ocsperr.h b/include/crypto/ocsperr.h
new file mode 100644
index 0000000000..e71b8424b4
--- /dev/null
+++ b/include/crypto/ocsperr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_OCSPERR_H
+# define OSSL_CRYPTO_OCSPERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_OCSP
+
+int err_load_OCSP_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/pemerr.h b/include/crypto/pemerr.h
new file mode 100644
index 0000000000..202369a964
--- /dev/null
+++ b/include/crypto/pemerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_PEMERR_H
+# define OSSL_CRYPTO_PEMERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_PEM_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/pkcs12err.h b/include/crypto/pkcs12err.h
new file mode 100644
index 0000000000..23d19357ec
--- /dev/null
+++ b/include/crypto/pkcs12err.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_PKCS12ERR_H
+# define OSSL_CRYPTO_PKCS12ERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_PKCS12_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/pkcs7err.h b/include/crypto/pkcs7err.h
new file mode 100644
index 0000000000..4880a5df93
--- /dev/null
+++ b/include/crypto/pkcs7err.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_PKCS7ERR_H
+# define OSSL_CRYPTO_PKCS7ERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_PKCS7_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/randerr.h b/include/crypto/randerr.h
new file mode 100644
index 0000000000..63e4f7db54
--- /dev/null
+++ b/include/crypto/randerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_RANDERR_H
+# define OSSL_CRYPTO_RANDERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_RAND_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/rsaerr.h b/include/crypto/rsaerr.h
new file mode 100644
index 0000000000..0c410f0db6
--- /dev/null
+++ b/include/crypto/rsaerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_RSAERR_H
+# define OSSL_CRYPTO_RSAERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_RSA_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/sm2err.h b/include/crypto/sm2err.h
index bbbb0cfecf..c82d92a13b 100644
--- a/include/crypto/sm2err.h
+++ b/include/crypto/sm2err.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -8,26 +8,25 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OPENSSL_SM2ERR_H
-# define OPENSSL_SM2ERR_H
+#ifndef OSSL_CRYPTO_SM2ERR_H
+# define OSSL_CRYPTO_SM2ERR_H
+# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
-
-# include <openssl/opensslconf.h>
+# ifdef __cplusplus
+extern "C" {
+# endif
# ifndef OPENSSL_NO_SM2
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_SM2_strings(void);
+int err_load_SM2_strings_int(void);
/*
* SM2 function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define SM2_F_PKEY_SM2_COPY 0
# define SM2_F_PKEY_SM2_CTRL 0
# define SM2_F_PKEY_SM2_CTRL_STR 0
@@ -46,7 +45,7 @@ int ERR_load_SM2_strings(void);
# define SM2_F_SM2_SIG_GEN 0
# define SM2_F_SM2_SIG_VERIFY 0
# define SM2_F_SM2_VERIFY 0
-# endif
+# endif
/*
* SM2 reason codes.
@@ -66,4 +65,8 @@ int ERR_load_SM2_strings(void);
# define SM2_R_USER_ID_TOO_LARGE 106
# endif
+
+# ifdef __cplusplus
+}
+# endif
#endif
diff --git a/include/crypto/storeerr.h b/include/crypto/storeerr.h
new file mode 100644
index 0000000000..133dda2208
--- /dev/null
+++ b/include/crypto/storeerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_STOREERR_H
+# define OSSL_CRYPTO_STOREERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_OSSL_STORE_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/tserr.h b/include/crypto/tserr.h
new file mode 100644
index 0000000000..2cb6dee5c5
--- /dev/null
+++ b/include/crypto/tserr.h
@@ -0,0 +1,30 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_TSERR_H
+# define OSSL_CRYPTO_TSERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifndef OPENSSL_NO_TS
+
+int err_load_TS_strings_int(void);
+# endif
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/uierr.h b/include/crypto/uierr.h
new file mode 100644
index 0000000000..733b6f05fd
--- /dev/null
+++ b/include/crypto/uierr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_UIERR_H
+# define OSSL_CRYPTO_UIERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_UI_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/x509err.h b/include/crypto/x509err.h
new file mode 100644
index 0000000000..8115629464
--- /dev/null
+++ b/include/crypto/x509err.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_X509ERR_H
+# define OSSL_CRYPTO_X509ERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_X509_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/crypto/x509v3err.h b/include/crypto/x509v3err.h
new file mode 100644
index 0000000000..1ff98b92f3
--- /dev/null
+++ b/include/crypto/x509v3err.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_X509V3ERR_H
+# define OSSL_CRYPTO_X509V3ERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_X509V3_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif
diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h
index ce9c8f0cf3..031e6798d3 100644
--- a/include/internal/dsoerr.h
+++ b/include/internal/dsoerr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,15 +10,16 @@
#ifndef OSSL_INTERNAL_DSOERR_H
# define OSSL_INTERNAL_DSOERR_H
+# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
-
# ifdef __cplusplus
-extern "C"
+extern "C" {
# endif
-int ERR_load_DSO_strings(void);
+
+int err_load_DSO_strings_int(void);
/*
* DSO function codes.
@@ -81,4 +82,8 @@ int ERR_load_DSO_strings(void);
# define DSO_R_UNLOAD_FAILED 107
# define DSO_R_UNSUPPORTED 108
+
+# ifdef __cplusplus
+}
+# endif
#endif
diff --git a/include/internal/propertyerr.h b/include/internal/propertyerr.h
index 52c8fad9d5..b0ec266ded 100644
--- a/include/internal/propertyerr.h
+++ b/include/internal/propertyerr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -10,15 +10,16 @@
#ifndef OSSL_INTERNAL_PROPERTYERR_H
# define OSSL_INTERNAL_PROPERTYERR_H
+# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
-
# ifdef __cplusplus
-extern "C"
+extern "C" {
# endif
-int ERR_load_PROP_strings(void);
+
+int err_load_PROP_strings_int(void);
/*
* PROP function codes.
@@ -49,4 +50,8 @@ int ERR_load_PROP_strings(void);
# define PROP_R_STRING_TOO_LONG 109
# define PROP_R_TRAILING_CHARACTERS 110
+
+# ifdef __cplusplus
+}
+# endif
#endif
diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index a29722e868..08281187ef 100644
--- a/include/openssl/asn1err.h
+++ b/include/openssl/asn1err.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_ASN1_strings(void);
/*
* ASN1 function codes.
diff --git a/include/openssl/asyncerr.h b/include/openssl/asyncerr.h
index 4dcd5495e8..e69ed42433 100644
--- a/include/openssl/asyncerr.h
+++ b/include/openssl/asyncerr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_ASYNC_strings(void);
/*
* ASYNC function codes.
diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h
index 7c51cceb7e..00a7df227e 100644
--- a/include/openssl/bioerr.h
+++ b/include/openssl/bioerr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_BIO_strings(void);
/*
* BIO function codes.
diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h
index d5c442a400..59f3e6fae4 100644
--- a/include/openssl/bnerr.h
+++ b/include/openssl/bnerr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_BN_strings(void);
/*
* BN function codes.
@@ -46,6 +43,7 @@ int ERR_load_BN_strings(void);
# define BN_F_BN_GENCB_NEW 0
# define BN_F_BN_GENERATE_DSA_NONCE 0
# define BN_F_BN_GENERATE_PRIME_EX 0
+# define BN_F_BN_GENERATE_PRIME_EX2 0
# define BN_F_BN_GF2M_MOD 0
# define BN_F_BN_GF2M_MOD_EXP 0
# define BN_F_BN_GF2M_MOD_MUL 0
diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h
index 09364b5365..27222edc32 100644
--- a/include/openssl/buffererr.h
+++ b/include/openssl/buffererr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_BUF_strings(void);
/*
* BUF function codes.
diff --git a/include/openssl/cmperr.h b/include/openssl/cmperr.h
index 190e1a96bd..d875f906d7 100644
--- a/include/openssl/cmperr.h
+++ b/include/openssl/cmperr.h
@@ -14,22 +14,17 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_CMP
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_CMP_strings(void);
/*
* CMP function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-# endif
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+# endif
/*
* CMP reason codes.
diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h
index e234ad0126..68e40f880f 100644
--- a/include/openssl/cmserr.h
+++ b/include/openssl/cmserr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_CMS
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_CMS_strings(void);
/*
* CMS function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define CMS_F_CHECK_CONTENT 0
# define CMS_F_CMS_ADD0_CERT 0
# define CMS_F_CMS_ADD0_RECIPIENT_KEY 0
@@ -121,7 +116,7 @@ int ERR_load_CMS_strings(void);
# define CMS_F_CMS_VERIFY 0
# define CMS_F_ESS_CHECK_SIGNING_CERTS 0
# define CMS_F_KEK_UNWRAP_KEY 0
-# endif
+# endif
/*
* CMS reason codes.
diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h
index 588457450d..7933e372a0 100644
--- a/include/openssl/comperr.h
+++ b/include/openssl/comperr.h
@@ -14,27 +14,22 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_COMP
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_COMP_strings(void);
/*
* COMP function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define COMP_F_BIO_ZLIB_FLUSH 0
# define COMP_F_BIO_ZLIB_NEW 0
# define COMP_F_BIO_ZLIB_READ 0
# define COMP_F_BIO_ZLIB_WRITE 0
# define COMP_F_COMP_CTX_NEW 0
-# endif
+# endif
/*
* COMP reason codes.
diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h
index 80bf53f365..f16d65daa8 100644
--- a/include/openssl/conferr.h
+++ b/include/openssl/conferr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_CONF_strings(void);
/*
* CONF function codes.
diff --git a/include/openssl/crmferr.h b/include/openssl/crmferr.h
index a4c194e094..47bf3e41ff 100644
--- a/include/openssl/crmferr.h
+++ b/include/openssl/crmferr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_CRMF
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_CRMF_strings(void);
/*
* CRMF function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define CRMF_F_CRMF_POPOSIGNINGKEY_INIT 0
# define CRMF_F_OSSL_CRMF_CERTID_GEN 0
# define CRMF_F_OSSL_CRMF_CERTTEMPLATE_FILL 0
@@ -43,12 +38,12 @@ int ERR_load_CRMF_strings(void);
# define CRMF_F_OSSL_CRMF_MSG_PUSH0_REGINFO 0
# define CRMF_F_OSSL_CRMF_MSG_SET0_EXTENSIONS 0
# define CRMF_F_OSSL_CRMF_MSG_SET0_SINGLEPUBINFO 0
+# define CRMF_F_OSSL_CRMF_MSG_SET0_VALIDITY 0
# define CRMF_F_OSSL_CRMF_MSG_SET_CERTREQID 0
# define CRMF_F_OSSL_CRMF_MSG_SET_PKIPUBLICATIONINFO_ACTION 0
-# define CRMF_F_OSSL_CRMF_MSG_SET0_VALIDITY 0
# define CRMF_F_OSSL_CRMF_PBMP_NEW 0
# define CRMF_F_OSSL_CRMF_PBM_NEW 0
-# endif
+# endif
/*
* CRMF reason codes.
diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index 6add92a9ca..971ae122b9 100644
--- a/include/openssl/cryptoerr.h
+++ b/include/openssl/cryptoerr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_CRYPTO_strings(void);
/*
* CRYPTO function codes.
diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h
index ae02edf180..439e8b8363 100644
--- a/include/openssl/cterr.h
+++ b/include/openssl/cterr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_CT
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_CT_strings(void);
/*
* CT function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define CT_F_CTLOG_NEW 0
# define CT_F_CTLOG_NEW_FROM_BASE64 0
# define CT_F_CTLOG_NEW_FROM_CONF 0
@@ -56,7 +51,7 @@ int ERR_load_CT_strings(void);
# define CT_F_SCT_SET_LOG_ENTRY_TYPE 0
# define CT_F_SCT_SET_SIGNATURE_NID 0
# define CT_F_SCT_SET_VERSION 0
-# endif
+# endif
/*
* CT reason codes.
diff --git a/include/openssl/decodererr.h b/include/openssl/decodererr.h
index 8da9157814..a82fc7bd0d 100644
--- a/include/openssl/decodererr.h
+++ b/include/openssl/decodererr.h
@@ -8,18 +8,15 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OPENSSL_OSSL_DECODERERR_H
-# define OPENSSL_OSSL_DECODERERR_H
+#ifndef OPENSSL_DECODERERR_H
+# define OPENSSL_DECODERERR_H
# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_OSSL_DECODER_strings(void);
/*
* OSSL_DECODER function codes.
@@ -30,6 +27,6 @@ int ERR_load_OSSL_DECODER_strings(void);
/*
* OSSL_DECODER reason codes.
*/
-# define OSSL_DECODER_R_MISSING_GET_PARAMS 100
+# define OSSL_DECODER_R_MISSING_GET_PARAMS 100
#endif
diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h
index 1b8fb17172..17910ef541 100644
--- a/include/openssl/dherr.h
+++ b/include/openssl/dherr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_DH
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_DH_strings(void);
/*
* DH function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define DH_F_COMPUTE_KEY 0
# define DH_F_DHPARAMS_PRINT_FP 0
# define DH_F_DH_BUF2KEY 0
@@ -57,7 +52,7 @@ int ERR_load_DH_strings(void);
# define DH_F_PKEY_DH_DERIVE 0
# define DH_F_PKEY_DH_INIT 0
# define DH_F_PKEY_DH_KEYGEN 0
-# endif
+# endif
/*
* DH reason codes.
diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h
index 271f24a2b5..0c60171263 100644
--- a/include/openssl/dsaerr.h
+++ b/include/openssl/dsaerr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_DSA
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_DSA_strings(void);
/*
* DSA function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define DSA_F_DSAPARAMS_PRINT 0
# define DSA_F_DSAPARAMS_PRINT_FP 0
# define DSA_F_DSA_BUILTIN_PARAMGEN 0
@@ -52,7 +47,7 @@ int ERR_load_DSA_strings(void);
# define DSA_F_PKEY_DSA_CTRL 0
# define DSA_F_PKEY_DSA_CTRL_STR 0
# define DSA_F_PKEY_DSA_KEYGEN 0
-# endif
+# endif
/*
* DSA reason codes.
diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h
index 60677d8560..64037fd81b 100644
--- a/include/openssl/ecerr.h
+++ b/include/openssl/ecerr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_EC
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_EC_strings(void);
/*
* EC function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define EC_F_BN_TO_FELEM 0
# define EC_F_D2I_ECPARAMETERS 0
# define EC_F_D2I_ECPKPARAMETERS 0
@@ -219,7 +214,7 @@ int ERR_load_EC_strings(void);
# define EC_F_S390X_PKEY_ECX_KEYGEN25519 0
# define EC_F_S390X_PKEY_ECX_KEYGEN448 0
# define EC_F_VALIDATE_ECX_DERIVE 0
-# endif
+# endif
/*
* EC reason codes.
diff --git a/include/openssl/encodererr.h b/include/openssl/encodererr.h
index e146d6ec92..bef68d3adb 100644
--- a/include/openssl/encodererr.h
+++ b/include/openssl/encodererr.h
@@ -8,18 +8,15 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OPENSSL_OSSL_ENCODERERR_H
-# define OPENSSL_OSSL_ENCODERERR_H
+#ifndef OPENSSL_ENCODERERR_H
+# define OPENSSL_ENCODERERR_H
# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_OSSL_ENCODER_strings(void);
/*
* OSSL_ENCODER function codes.
diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h
index d60f321ccb..718882603d 100644
--- a/include/openssl/engineerr.h
+++ b/include/openssl/engineerr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_ENGINE
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_ENGINE_strings(void);
/*
* ENGINE function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define ENGINE_F_DIGEST_UPDATE 0
# define ENGINE_F_DYNAMIC_CTRL 0
# define ENGINE_F_DYNAMIC_GET_DATA_CTX 0
@@ -69,7 +64,7 @@ int ERR_load_ENGINE_strings(void);
# define ENGINE_F_INT_ENGINE_CONFIGURE 0
# define ENGINE_F_INT_ENGINE_MODULE_INIT 0
# define ENGINE_F_OSSL_HMAC_INIT 0
-# endif
+# endif
/*
* ENGINE reason codes.
diff --git a/include/openssl/esserr.h b/include/openssl/esserr.h
index ff3c3d3d95..ec69b56dfe 100644
--- a/include/openssl/esserr.h
+++ b/include/openssl/esserr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_ESS_strings(void);
/*
* ESS function codes.
diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h
index 1a3f5b6fbd..f98cca3104 100644
--- a/include/openssl/evperr.h
+++ b/include/openssl/evperr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_EVP_strings(void);
/*
* EVP function codes.
@@ -72,6 +69,8 @@ int ERR_load_EVP_strings(void);
# define EVP_F_EVP_KEYEXCH_FROM_DISPATCH 0
# define EVP_F_EVP_MAC_CTRL 0
# define EVP_F_EVP_MAC_CTRL_STR 0
+# define EVP_F_EVP_MAC_CTX_DUP 0
+# define EVP_F_EVP_MAC_CTX_NEW 0
# define EVP_F_EVP_MAC_INIT 0
# define EVP_F_EVP_MD_BLOCK_SIZE 0
# define EVP_F_EVP_MD_CTX_COPY_EX 0
diff --git a/include/openssl/httperr.h b/include/openssl/httperr.h
index 7747643bfa..4bf52bacb9 100644
--- a/include/openssl/httperr.h
+++ b/include/openssl/httperr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_HTTP_strings(void);
/*
* HTTP function codes.
diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h
index f1de77945b..aa61f83115 100644
--- a/include/openssl/objectserr.h
+++ b/include/openssl/objectserr.h
@@ -8,18 +8,15 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OPENSSL_OBJERR_H
-# define OPENSSL_OBJERR_H
+#ifndef OPENSSL_OBJECTSERR_H
+# define OPENSSL_OBJECTSERR_H
# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_OBJ_strings(void);
/*
* OBJ function codes.
diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h
index eea82b8a56..fc25908cf9 100644
--- a/include/openssl/ocsperr.h
+++ b/include/openssl/ocsperr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_OCSP
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_OCSP_strings(void);
/*
* OCSP function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define OCSP_F_D2I_OCSP_NONCE 0
# define OCSP_F_OCSP_BASIC_ADD1_STATUS 0
# define OCSP_F_OCSP_BASIC_SIGN 0
@@ -43,7 +38,7 @@ int ERR_load_OCSP_strings(void);
# define OCSP_F_OCSP_REQUEST_SIGN 0
# define OCSP_F_OCSP_REQUEST_VERIFY 0
# define OCSP_F_OCSP_RESPONSE_GET1_BASIC 0
-# endif
+# endif
/*
* OCSP reason codes.
diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h
index a8ad9f2c87..f9b9853431 100644
--- a/include/openssl/pemerr.h
+++ b/include/openssl/pemerr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_PEM_strings(void);
/*
* PEM function codes.
@@ -34,17 +31,17 @@ int ERR_load_PEM_strings(void);
# define PEM_F_D2I_PKCS8PRIVATEKEY_FP 0
# define PEM_F_DO_B2I 0
# define PEM_F_DO_B2I_BIO 0
-# define PEM_F_DO_BLOB_HEADER 0
# define PEM_F_DO_I2B 0
# define PEM_F_DO_PK8PKEY 0
# define PEM_F_DO_PK8PKEY_FP 0
# define PEM_F_DO_PVK_BODY 0
-# define PEM_F_DO_PVK_HEADER 0
# define PEM_F_GET_HEADER_AND_DATA 0
# define PEM_F_GET_NAME 0
# define PEM_F_I2B_PVK 0
# define PEM_F_I2B_PVK_BIO 0
# define PEM_F_LOAD_IV 0
+# define PEM_F_OSSL_DO_BLOB_HEADER 0
+# define PEM_F_OSSL_DO_PVK_HEADER 0
# define PEM_F_PEM_ASN1_READ 0
# define PEM_F_PEM_ASN1_READ_BIO 0
# define PEM_F_PEM_ASN1_WRITE 0
diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h
index 60369447de..d5e902e14c 100644
--- a/include/openssl/pkcs12err.h
+++ b/include/openssl/pkcs12err.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_PKCS12_strings(void);
/*
* PKCS12 function codes.
diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h
index ef06fbbb9f..f212c5f308 100644
--- a/include/openssl/pkcs7err.h
+++ b/include/openssl/pkcs7err.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_PKCS7_strings(void);
/*
* PKCS7 function codes.
diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h
index ccce5b60ce..34da4ec231 100644
--- a/include/openssl/randerr.h
+++ b/include/openssl/randerr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_RAND_strings(void);
/*
* RAND function codes.
@@ -33,17 +30,10 @@ int ERR_load_RAND_strings(void);
# define RAND_F_RAND_BYTES 0
# define RAND_F_RAND_BYTES_EX 0
# define RAND_F_RAND_DRBG_ENABLE_LOCKING 0
-# define RAND_F_RAND_DRBG_GENERATE 0
# define RAND_F_RAND_DRBG_GET_ENTROPY 0
# define RAND_F_RAND_DRBG_GET_NONCE 0
# define RAND_F_RAND_DRBG_INIT_METHOD 0
-# define RAND_F_RAND_DRBG_INSTANTIATE 0
-# define RAND_F_RAND_DRBG_NEW 0
-# define RAND_F_RAND_DRBG_RESEED 0
# define RAND_F_RAND_DRBG_RESTART 0
-# define RAND_F_RAND_DRBG_SET 0
-# define RAND_F_RAND_DRBG_SET_DEFAULTS 0
-# define RAND_F_RAND_DRBG_UNINSTANTIATE 0
# define RAND_F_RAND_LOAD_FILE 0
# define RAND_F_RAND_POOL_ACQUIRE_ENTROPY 0
# define RAND_F_RAND_POOL_ADD 0
diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h
index 794f433a05..c1b983e2e4 100644
--- a/include/openssl/rsaerr.h
+++ b/include/openssl/rsaerr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_RSA_strings(void);
/*
* RSA function codes.
diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index 56ece0d175..d2721d354c 100644
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/sslerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_SSL_strings(void);
/*
* SSL function codes.
diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h
index 5213a0b33c..e895e082c7 100644
--- a/include/openssl/storeerr.h
+++ b/include/openssl/storeerr.h
@@ -8,18 +8,15 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OPENSSL_OSSL_STOREERR_H
-# define OPENSSL_OSSL_STOREERR_H
+#ifndef OPENSSL_STOREERR_H
+# define OPENSSL_STOREERR_H
# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_OSSL_STORE_strings(void);
/*
* OSSL_STORE function codes.
diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h
index d29d3be11b..6e46c45e12 100644
--- a/include/openssl/tserr.h
+++ b/include/openssl/tserr.h
@@ -14,21 +14,16 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# include <openssl/opensslconf.h>
-
# ifndef OPENSSL_NO_TS
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_TS_strings(void);
/*
* TS function codes.
*/
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+# ifndef OPENSSL_NO_DEPRECATED_3_0
# define TS_F_DEF_SERIAL_CB 0
# define TS_F_DEF_TIME_CB 0
# define TS_F_INT_TS_RESP_VERIFY_TOKEN 0
@@ -80,7 +75,7 @@ int ERR_load_TS_strings(void);
# define TS_F_TS_VERIFY 0
# define TS_F_TS_VERIFY_CERT 0
# define TS_F_TS_VERIFY_CTX_NEW 0
-# endif
+# endif
/*
* TS reason codes.
diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h
index 7240bbbde5..edccfd58bb 100644
--- a/include/openssl/uierr.h
+++ b/include/openssl/uierr.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_UI_strings(void);
/*
* UI function codes.
diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h
index 94c5c5b75e..10021b6444 100644
--- a/include/openssl/x509err.h
+++ b/include/openssl/x509err.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_X509_strings(void);
/*
* X509 function codes.
diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h
index b245a63902..a3324e6e2c 100644
--- a/include/openssl/x509v3err.h
+++ b/include/openssl/x509v3err.h
@@ -14,12 +14,9 @@
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
+# include <openssl/cryptoerr_legacy.h>
-# ifdef __cplusplus
-extern "C"
-# endif
-int ERR_load_X509V3_strings(void);
/*
* X509V3 function codes.
@@ -123,13 +120,13 @@ int ERR_load_X509V3_strings(void);
# define X509V3_R_INVALID_ASRANGE 163
# define X509V3_R_INVALID_BOOLEAN_STRING 104
# define X509V3_R_INVALID_CERTIFICATE 158
+# define X509V3_R_INVALID_EMPTY_NAME 108
# define X509V3_R_INVALID_EXTENSION_STRING 105
# define X509V3_R_INVALID_INHERITANCE 165
# define X509V3_R_INVALID_IPADDRESS 166
# define X509V3_R_INVALID_MULTIPLE_RDNS 161
# define X509V3_R_INVALID_NAME 106
# define X509V3_R_INVALID_NULL_ARGUMENT 107
-# define X509V3_R_INVALID_EMPTY_NAME 108
# define X509V3_R_INVALID_NULL_VALUE 109
# define X509V3_R_INVALID_NUMBER 140
# define X509V3_R_INVALID_NUMBERS 141
diff --git a/providers/common/include/prov/providercommonerr.h b/providers/common/include/prov/providercommonerr.h
index 86a3667641..fd0d7f0380 100644
--- a/providers/common/include/prov/providercommonerr.h
+++ b/providers/common/include/prov/providercommonerr.h
@@ -1,6 +1,6 @@
/*
* Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -8,18 +8,18 @@
* https://www.openssl.org/source/license.html
*/
-#ifndef OPENSSL_PROVERR_H
-# define OPENSSL_PROVERR_H
+#ifndef OSSL_PROVIDERCOMMONERR_H
+# define OSSL_PROVIDERCOMMONERR_H
# pragma once
# include <openssl/opensslconf.h>
# include <openssl/symhacks.h>
-
# ifdef __cplusplus
-extern "C"
+extern "C" {
# endif
-int ERR_load_PROV_strings(void);
+
+int err_load_PROV_strings_int(void);
/*
* PROV function codes.
@@ -178,4 +178,8 @@ int ERR_load_PROV_strings(void);
# define PROV_R_XTS_DATA_UNIT_IS_TOO_LARGE 148
# define PROV_R_XTS_DUPLICATED_KEYS 149
+
+# ifdef __cplusplus
+}
+# endif
#endif
diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c
index 2915330b86..7bf2a55d99 100644
--- a/providers/common/provider_err.c
+++ b/providers/common/provider_err.c
@@ -9,7 +9,7 @@
*/
#include <openssl/err.h>
-#include "prov/providercommonerr.h"
+#include "include/prov/providercommonerr.h"
#ifndef OPENSSL_NO_ERR
@@ -223,7 +223,7 @@ static const ERR_STRING_DATA PROV_str_reasons[] = {
#endif
-int ERR_load_PROV_strings(void)
+int err_load_PROV_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(PROV_str_reasons[0].error) == NULL)
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 9f47a924f0..39db31bee6 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -10,6 +10,7 @@
#include <openssl/err.h>
#include <openssl/sslerr.h>
+#include "sslerr.h"
#ifndef OPENSSL_NO_ERR
@@ -557,7 +558,7 @@ static const ERR_STRING_DATA SSL_str_reasons[] = {
#endif
-int ERR_load_SSL_strings(void)
+int err_load_SSL_strings_int(void)
{
#ifndef OPENSSL_NO_ERR
if (ERR_reason_error_string(SSL_str_reasons[0].error) == NULL)
diff --git a/ssl/sslerr.h b/ssl/sslerr.h
new file mode 100644
index 0000000000..9b496f2c0a
--- /dev/null
+++ b/ssl/sslerr.h
@@ -0,0 +1,27 @@
+/*
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 2020-2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_SSLERR_H
+# define OSSL_SSLERR_H
+# pragma once
+
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+int err_load_SSL_strings_int(void);
+
+# ifdef __cplusplus
+}
+# endif
+#endif