diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-11 13:51:58 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-18 13:30:44 +0100 |
| commit | efffd8a6e452102dbf25b1f801c9312211c5fe4a (patch) | |
| tree | c55927d3804648d2ad8f2af38a7cee371b08f417 | |
| parent | 2ca697ce0006efa0a7b3662a1360eea10a56d2ab (diff) | |
Update err.h to use the new lhash generation code
Generate the lhash macros for the ERR_STRING_DATA type
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12860)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | build.info | 2 | ||||
| -rw-r--r-- | include/openssl/err.h.in (renamed from include/openssl/err.h) | 8 |
3 files changed, 10 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8f4bc6af85..a463fc3c96 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ /include/openssl/crmf.h /include/openssl/crypto.h /include/openssl/ct.h +/include/openssl/err.h /include/openssl/ess.h /include/openssl/fipskey.h /include/openssl/ocsp.h diff --git a/build.info b/build.info index 8aa668e913..dc239a706d 100644 --- a/build.info +++ b/build.info @@ -23,6 +23,7 @@ DEPEND[]=include/openssl/asn1.h \ include/openssl/crmf.h \ include/openssl/crypto.h \ include/openssl/ct.h \ + include/openssl/err.h \ include/openssl/ess.h \ include/openssl/fipskey.h \ include/openssl/opensslv.h \ @@ -49,6 +50,7 @@ GENERATE[include/openssl/configuration.h]=include/openssl/configuration.h.in GENERATE[include/openssl/crmf.h]=include/openssl/crmf.h.in GENERATE[include/openssl/crypto.h]=include/openssl/crypto.h.in GENERATE[include/openssl/ct.h]=include/openssl/ct.h.in +GENERATE[include/openssl/err.h]=include/openssl/err.h.in GENERATE[include/openssl/ess.h]=include/openssl/ess.h.in GENERATE[include/openssl/fipskey.h]=include/openssl/fipskey.h.in GENERATE[include/openssl/ocsp.h]=include/openssl/ocsp.h.in diff --git a/include/openssl/err.h b/include/openssl/err.h.in index 8e76b812df..b916f436e3 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h.in @@ -7,6 +7,10 @@ * https://www.openssl.org/source/license.html */ +{- +use OpenSSL::stackhash qw(generate_lhash_macros); +-} + #ifndef OPENSSL_ERR_H # define OPENSSL_ERR_H # pragma once @@ -337,7 +341,9 @@ typedef struct ERR_string_data_st { const char *string; } ERR_STRING_DATA; -DEFINE_LHASH_OF(ERR_STRING_DATA); +{- + generate_lhash_macros("ERR_STRING_DATA"); +-} /* 12 lines and some on an 80 column terminal */ #define ERR_MAX_DATA_SIZE 1024 |