ERR: Modify util/mkerr.pl to produce internal err string loaders

This also modifies the .ec L statement to take a third file, which is
the internal header file to declare internal things.  This is only
useful for our internal declarations and will not affect engines.

Fixes #10527

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13390)

1 files changed, 43 insertions, 49 deletions

diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 589ff1094c..f265ca0f5d 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -1,55 +1,49 @@
 # configuration file for util/mkerr.pl
 
 # The INPUT HEADER is scanned for declarations
-# LIBNAME       INPUT HEADER                    ERROR-TABLE FILE
-L ERR           NONE                            NONE
-L FUNC          NONE                            NONE
-L BN            include/openssl/bn.h            crypto/bn/bn_err.c
-L RSA           include/openssl/rsa.h           crypto/rsa/rsa_err.c
-L DH            include/openssl/dh.h            crypto/dh/dh_err.c
-L EVP           include/openssl/evp.h           crypto/evp/evp_err.c
-L BUF           include/openssl/buffer.h        crypto/buffer/buf_err.c
-L OBJ           include/openssl/objects.h       crypto/objects/obj_err.c
-L PEM           include/openssl/pem.h           crypto/pem/pem_err.c
-L DSA           include/openssl/dsa.h           crypto/dsa/dsa_err.c
-L X509          include/openssl/x509.h          crypto/x509/x509_err.c
-L ASN1          include/openssl/asn1.h          crypto/asn1/asn1_err.c
-L CONF          include/openssl/conf.h          crypto/conf/conf_err.c
-L CRYPTO        include/openssl/crypto.h        crypto/cpt_err.c
-L EC            include/openssl/ec.h            crypto/ec/ec_err.c
-L SSL           include/openssl/ssl.h           ssl/ssl_err.c
-L BIO           include/openssl/bio.h           crypto/bio/bio_err.c
-L PKCS7         include/openssl/pkcs7.h         crypto/pkcs7/pkcs7err.c
-L X509V3        include/openssl/x509v3.h        crypto/x509/v3err.c
-L PKCS12        include/openssl/pkcs12.h        crypto/pkcs12/pk12err.c
-L RAND          include/openssl/rand.h          crypto/rand/rand_err.c
-L DSO           include/internal/dso.h          crypto/dso/dso_err.c
-L ENGINE        include/openssl/engine.h        crypto/engine/eng_err.c
-L OCSP          include/openssl/ocsp.h          crypto/ocsp/ocsp_err.c
-L UI            include/openssl/ui.h            crypto/ui/ui_err.c
-L COMP          include/openssl/comp.h          crypto/comp/comp_err.c
-L TS            include/openssl/ts.h            crypto/ts/ts_err.c
-L CMS           include/openssl/cms.h           crypto/cms/cms_err.c
-L CRMF          include/openssl/crmf.h          crypto/crmf/crmf_err.c
-L CMP           include/openssl/cmp.h           crypto/cmp/cmp_err.c
-L CT            include/openssl/ct.h            crypto/ct/ct_err.c
-L ASYNC         include/openssl/async.h         crypto/async/async_err.c
-L KDF           NONE                            crypto/kdf/kdf_err.c
-L SM2           include/crypto/sm2.h            crypto/sm2/sm2_err.c
-L OSSL_STORE    include/openssl/store.h         crypto/store/store_err.c
-L ESS           include/openssl/ess.h           crypto/ess/ess_err.c
-L PROP          include/internal/property.h     crypto/property/property_err.c
-L PROV          providers/common/include/prov/providercommon.h providers/common/provider_err.c
-L OSSL_ENCODER  include/openssl/encoder.h       crypto/encode_decode/encoder_err.c
-L OSSL_DECODER  include/openssl/decoder.h       crypto/encode_decode/decoder_err.c
-L HTTP          include/openssl/http.h          crypto/http/http_err.c
-
-# additional header files to be scanned for function names
-L NONE          include/openssl/x509_vfy.h      NONE
-L NONE          crypto/ec/ec_local.h            NONE
-L NONE          crypto/cms/cms_local.h          NONE
-L NONE          crypto/ct/ct_local.h            NONE
-L NONE          ssl/ssl_local.h                 NONE
+# LIBNAME       PUBLIC HEADER                   ERROR-TABLE FILE                        INTERNAL HEADER (if relevant)
+L ERR           NONE                            NONE                                    
+L FUNC          NONE                            NONE                                    
+L BN            include/openssl/bnerr.h         crypto/bn/bn_err.c                      include/crypto/bnerr.h
+L RSA           include/openssl/rsaerr.h        crypto/rsa/rsa_err.c                    include/crypto/rsaerr.h
+L DH            include/openssl/dherr.h         crypto/dh/dh_err.c                      include/crypto/dherr.h
+L EVP           include/openssl/evperr.h        crypto/evp/evp_err.c                    include/crypto/evperr.h
+L BUF           include/openssl/buffererr.h     crypto/buffer/buf_err.c                 include/crypto/buffererr.h
+L OBJ           include/openssl/objectserr.h    crypto/objects/obj_err.c                include/crypto/objectserr.h
+L PEM           include/openssl/pemerr.h        crypto/pem/pem_err.c                    include/crypto/pemerr.h
+L DSA           include/openssl/dsaerr.h        crypto/dsa/dsa_err.c                    include/crypto/dsaerr.h
+L X509          include/openssl/x509err.h       crypto/x509/x509_err.c                  include/crypto/x509err.h
+L ASN1          include/openssl/asn1err.h       crypto/asn1/asn1_err.c                  include/crypto/asn1err.h
+L CONF          include/openssl/conferr.h       crypto/conf/conf_err.c                  include/crypto/conferr.h
+L CRYPTO        include/openssl/cryptoerr.h     crypto/cpt_err.c                        include/crypto/cryptoerr.h
+L EC            include/openssl/ecerr.h         crypto/ec/ec_err.c                      include/crypto/ecerr.h
+L SSL           include/openssl/sslerr.h        ssl/ssl_err.c                           ssl/sslerr.h
+L BIO           include/openssl/bioerr.h        crypto/bio/bio_err.c                    include/crypto/bioerr.h
+L PKCS7         include/openssl/pkcs7err.h      crypto/pkcs7/pkcs7err.c                 include/crypto/pkcs7err.h
+L X509V3        include/openssl/x509v3err.h     crypto/x509/v3err.c                     include/crypto/x509v3err.h
+L PKCS12        include/openssl/pkcs12err.h     crypto/pkcs12/pk12err.c                 include/crypto/pkcs12err.h
+L RAND          include/openssl/randerr.h       crypto/rand/rand_err.c                  include/crypto/randerr.h
+L DSO           NONE                            crypto/dso/dso_err.c                    include/internal/dsoerr.h
+L ENGINE        include/openssl/engineerr.h     crypto/engine/eng_err.c                 include/crypto/engineerr.h
+L OCSP          include/openssl/ocsperr.h       crypto/ocsp/ocsp_err.c                  include/crypto/ocsperr.h
+L UI            include/openssl/uierr.h         crypto/ui/ui_err.c                      include/crypto/uierr.h
+L COMP          include/openssl/comperr.h       crypto/comp/comp_err.c                  include/crypto/comperr.h
+L TS            include/openssl/tserr.h         crypto/ts/ts_err.c                      include/crypto/tserr.h
+L CMS           include/openssl/cmserr.h        crypto/cms/cms_err.c                    include/crypto/cmserr.h
+L CRMF          include/openssl/crmferr.h       crypto/crmf/crmf_err.c                  include/crypto/crmferr.h
+L CMP           include/openssl/cmperr.h        crypto/cmp/cmp_err.c                    include/crypto/cmperr.h
+L CT            include/openssl/cterr.h         crypto/ct/ct_err.c                      include/crypto/cterr.h
+L ASYNC         include/openssl/asyncerr.h      crypto/async/async_err.c                include/crypto/asyncerr.h
+# KDF is only here for conservation purposes
+L KDF           NONE                            NONE                                    NONE
+L SM2           NONE                            crypto/sm2/sm2_err.c                    include/crypto/sm2err.h
+L OSSL_STORE    include/openssl/storeerr.h      crypto/store/store_err.c                include/crypto/storeerr.h
+L ESS           include/openssl/esserr.h        crypto/ess/ess_err.c                    include/crypto/esserr.h
+L PROP          NONE                            crypto/property/property_err.c          include/internal/propertyerr.h
+L PROV          NONE                            providers/common/provider_err.c         providers/common/include/prov/providercommonerr.h
+L OSSL_ENCODER  include/openssl/encodererr.h    crypto/encode_decode/encoder_err.c      include/crypto/encodererr.h
+L OSSL_DECODER  include/openssl/decodererr.h    crypto/encode_decode/decoder_err.c      include/crypto/decodererr.h
+L HTTP          include/openssl/httperr.h       crypto/http/http_err.c                  include/crypto/httperr.h
 
 # SSL/TLS alerts
 R SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE          1010