From: Matt Caswell <matt@openssl.org>
Date: Tue, 15 Sep 2020 13:00:37 +0000 (+0100)
Subject: Fix some doc-nits and make update errors
X-Git-Tag: openssl-3.0.0-alpha7~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=282de1cc2d71a95482ce431b9ed620f85eb6acbd;p=thirdparty%2Fopenssl.git

Fix some doc-nits and make update errors

The new lhash changes have confused some of the perl scripts so we add
some fixes.

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

diff --git a/util/find-doc-nits b/util/find-doc-nits
index 006edbd184b..ac661827dda 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -100,6 +100,8 @@ my $ignored = qr/(?| ^i2d_
                  |   ^_?DECLARE_
                  |   ^sk_
                  |   ^SKM_DEFINE_STACK_OF_INTERNAL
+                 |   ^lh_
+                 |   ^DEFINE_LHASH_OF_INTERNAL
                  )/x;
 
 # Collect all POD files, both internal and public, and regardless of location
diff --git a/util/perl/OpenSSL/ParseC.pm b/util/perl/OpenSSL/ParseC.pm
index b2ac909dc18..7e6377dd175 100644
--- a/util/perl/OpenSSL/ParseC.pm
+++ b/util/perl/OpenSSL/ParseC.pm
@@ -281,7 +281,7 @@ EOF
     { regexp   => qr/(.*)\bLHASH_OF<<<\((.*?)\)>>>(.*)/,
       massager => sub { return ("$1struct lhash_st_$2$3"); }
     },
-    { regexp   => qr/DEFINE_LHASH_OF<<<\((.*)\)>>>/,
+    { regexp   => qr/DEFINE_LHASH_OF(?:_INTERNAL)?<<<\((.*)\)>>>/,
       massager => sub {
           return (<<"EOF");
 static ossl_inline LHASH_OF($1) * lh_$1_new(unsigned long (*hfn)(const $1 *),