diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-11-10 13:03:15 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-12 13:30:34 +0100 |
| commit | dc5ce51983713dfbb8f3d0c8b198dee32b563ac6 (patch) | |
| tree | d920a40245517fb4feb33342a012343a87c4038b | |
| parent | 7c6a0d909abda7c854b44831ef43ebdda49ed42e (diff) | |
util/perl/OpenSSL/ParseC.pm: Fix 'extern "C" DEPRECATEDIN_x_y(...)'
The parser expected an 'extern "C"' followed by a single declaration
to always end with a semicolon. Then came along something like this:
extern "C" DEPRECATEDIN_3_0(int ERR_load_KDF_strings(void))
This change adjusts the detector of 'extern "C"' to also take in
accound a declaration that ends with a parenthesis.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10368)
| -rw-r--r-- | util/perl/OpenSSL/ParseC.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/perl/OpenSSL/ParseC.pm b/util/perl/OpenSSL/ParseC.pm index 2db43e2a61..392e61faf2 100644 --- a/util/perl/OpenSSL/ParseC.pm +++ b/util/perl/OpenSSL/ParseC.pm @@ -561,7 +561,7 @@ my @chandlers = ( # Note that the main parse function has a special hack for 'extern "C" {' # which can't be done in handlers # We simply ignore it. - { regexp => qr/extern "C" (.*;)/, + { regexp => qr/^extern "C" (.*(?:;|>>>))/, massager => sub { return ($1); }, }, # any other extern is just ignored |