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)
This commit is contained in:
Matt Caswell 2020-09-11 13:51:58 +01:00
parent 2ca697ce00
commit efffd8a6e4
3 changed files with 10 additions and 1 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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

View File

@ -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