QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-03 21:19:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix some missed usage of DEFINE_LHASH_OF()

Browse Source 
PR#12860 fixed issues with the Lhash code. It replaced usage of
DEFINE_LHASH_OF() in the public headers. Unfortunately it missed a couple
of instances.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13274)
This commit is contained in:
Matt Caswell 2020-10-29 12:46:28 +00:00
parent 140eee2b3b
commit e82f45982c
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,6 +35,7 @@
/include/openssl/err.h /include/openssl/err.h
/include/openssl/ess.h /include/openssl/ess.h
/include/openssl/fipskey.h /include/openssl/fipskey.h
/include/openssl/lhash.h
/include/openssl/ocsp.h /include/openssl/ocsp.h
/include/openssl/opensslv.h /include/openssl/opensslv.h
/include/openssl/pkcs12.h /include/openssl/pkcs12.h

2
build.info
View File

@ -26,6 +26,7 @@ DEPEND[]=include/openssl/asn1.h \
include/openssl/err.h \ include/openssl/err.h \
include/openssl/ess.h \ include/openssl/ess.h \
include/openssl/fipskey.h \ include/openssl/fipskey.h \
include/openssl/lhash.h \
include/openssl/opensslv.h \ include/openssl/opensslv.h \
include/openssl/ocsp.h \ include/openssl/ocsp.h \
include/openssl/pkcs12.h \ include/openssl/pkcs12.h \
@ -53,6 +54,7 @@ GENERATE[include/openssl/ct.h]=include/openssl/ct.h.in
GENERATE[include/openssl/err.h]=include/openssl/err.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/ess.h]=include/openssl/ess.h.in
GENERATE[include/openssl/fipskey.h]=include/openssl/fipskey.h.in GENERATE[include/openssl/fipskey.h]=include/openssl/fipskey.h.in
GENERATE[include/openssl/lhash.h]=include/openssl/lhash.h.in
GENERATE[include/openssl/ocsp.h]=include/openssl/ocsp.h.in GENERATE[include/openssl/ocsp.h]=include/openssl/ocsp.h.in
GENERATE[include/openssl/opensslv.h]=include/openssl/opensslv.h.in GENERATE[include/openssl/opensslv.h]=include/openssl/opensslv.h.in
GENERATE[include/openssl/pkcs12.h]=include/openssl/pkcs12.h.in GENERATE[include/openssl/pkcs12.h]=include/openssl/pkcs12.h.in

23
include/openssl/lhash.h → include/openssl/lhash.h.in
View File

@ -7,6 +7,10 @@
* https://www.openssl.org/source/license.html * https://www.openssl.org/source/license.html
*/ */
{-
use OpenSSL::stackhash qw(generate_lhash_macros);
-}
/* /*
* Header for dynamic hash table routines Author - Eric Young * Header for dynamic hash table routines Author - Eric Young
*/ */
@ -240,21 +244,10 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
} \ } \
LHASH_OF(type) LHASH_OF(type)
DEFINE_LHASH_OF(OPENSSL_STRING); {-
# ifdef _MSC_VER generate_lhash_macros("OPENSSL_STRING")
/* .generate_lhash_macros("OPENSSL_CSTRING");
* push and pop this warning: -}
* warning C4090: 'function': different 'const' qualifiers
*/
# pragma warning (push)
# pragma warning (disable: 4090)
# endif
DEFINE_LHASH_OF(OPENSSL_CSTRING);
# ifdef _MSC_VER
# pragma warning (pop)
# endif
#ifdef __cplusplus #ifdef __cplusplus
} }