The branch master has been updated
via e66b62b86e7725bdace0f24a76baa61db9c763f8 (commit)
from 0ef2802165706016698d6984dfcb2980881f18e5 (commit)
- Log -----------------------------------------------------------------
commit e66b62b86e7725bdace0f24a76baa61db9c763f8
Author: Richard Levitte <[email protected]>
Date: Thu Aug 31 11:35:25 2017 +0200
util/mkdef.pl: handle line terminators correctly
When parsing the header files, mkdef.pl didn't clear the line
terminator properly. In most cases, this didn't matter, but there
were moments when this caused parsing errors (such as CRLFs in certain
cases).
Fixes #4267
Reviewed-by: Andy Polyakov <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4304)
-----------------------------------------------------------------------
Summary of changes:
util/mkdef.pl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 8c0ccd0..7a4e455 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -412,10 +412,10 @@ sub do_defs
print STDERR "DEBUG: parsing ----------\n" if $debug;
while(<IN>) {
+ s|\R$||; # Better chomp
if($parens > 0) {
#Inside a DEPRECATEDIN
$stored_multiline .= $_;
- $stored_multiline =~ s|\R$||; # Better chomp
print STDERR "DEBUG: Continuing multiline
DEPRECATEDIN: $stored_multiline\n" if $debug;
$parens = count_parens($stored_multiline);
if ($parens == 0) {
@@ -847,7 +847,6 @@ sub do_defs
\@current_algorithms);
} else {
$stored_multiline = $_;
- $stored_multiline =~ s|\R$||;
print STDERR "DEBUG: Found
multiline DEPRECATEDIN starting with: $stored_multiline\n" if $debug;
next;
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
