From: Matt Caswell <matt@openssl.org>
Date: Fri, 11 Sep 2020 12:48:31 +0000 (+0100)
Subject: Update conf.h.in to use the new lhash generation code
X-Git-Tag: openssl-3.0.0-alpha7~209
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ca697ce0006efa0a7b3662a1360eea10a56d2ab;p=thirdparty%2Fopenssl.git

Update conf.h.in to use the new lhash generation code

Generate the lhash macros for the CONF_VALUE type

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12860)
---

diff --git a/include/openssl/conf.h.in b/include/openssl/conf.h.in
index 2f1fceb2fbf..6e3a10ed55d 100644
--- a/include/openssl/conf.h.in
+++ b/include/openssl/conf.h.in
@@ -10,7 +10,7 @@
  */
 
 {-
-use OpenSSL::stackhash qw(generate_stack_macros);
+use OpenSSL::stackhash qw(generate_stack_macros generate_lhash_macros);
 -}
 
 #ifndef  OPENSSL_CONF_H
@@ -40,11 +40,10 @@ typedef struct {
 } CONF_VALUE;
 
 {-
-    generate_stack_macros("CONF_VALUE");
+    generate_stack_macros("CONF_VALUE")
+    .generate_lhash_macros("CONF_VALUE");
 -}
 
-DEFINE_LHASH_OF(CONF_VALUE);
-
 struct conf_st;
 struct conf_method_st;
 typedef struct conf_method_st CONF_METHOD;