Fix some issues near recent chomp changes.

[openssl.git] / util / mkfiles.pl

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 17b7d46957c4c505d92b4effd357738b171ecb29..55dfbc64e376acd12a77adeaf3c3df7d5d4b4f4e 100755 (executable)
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -34,8 +34,6 @@ my @dirs = (
 "crypto/dso",
 "crypto/dh",
 "crypto/ec",
-"crypto/ecdh",
-"crypto/ecdsa",
 "crypto/buffer",
 "crypto/bio",
 "crypto/stack",
@@ -58,27 +56,18 @@ my @dirs = (
 "crypto/engine",
 "crypto/ocsp",
 "crypto/ui",
-"crypto/krb5",
 #"crypto/store",
-"crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
 "crypto/srp",
-"fips",
-"fips/aes",
-"fips/des",
-"fips/dsa",
-"fips/dh",
-"fips/ecdsa",
-"fips/hmac",
-"fips/rand",
-"fips/rsa",
-"fips/utl",
-"fips/sha",
+"crypto/ct",
+"crypto/async",
+"crypto/chacha",
+"crypto/poly1305",
+"crypto/kdf",
 "ssl",
 "apps",
 "engines",
-"engines/ccgost",
 "test",
 "tools"
 );
@@ -106,9 +95,9 @@ my $s="";
 
 while (<IN>)
        {
-       chop;
+       s|\R$||;
        s/#.*//;
-       if (/^(\S+)\s*=\s*(.*)$/)
+       if (/^([^\s=]+)\s*=\s*(.*)$/)
                {
                $o="";
                ($s,$b)=($1,$2);
@@ -116,10 +105,10 @@ while (<IN>)
                        {
                        if ($b =~ /\\$/)
                                {
-                               chop($b);
+                               $b=$`;
                                $o.=$b." ";
-                               $b=<IN>;
-                               chop($b);
+                               $b = "" unless defined($b = <IN>);
+                               $b =~ s{\R$}{};
                                }
                        else
                                {
@@ -154,7 +143,7 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
-if ($dir eq "." && $sym{CONFIGURE_ARGS} =~ /fipscanisteronly/)
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
        {
        $fipscanisteronly = 1;
        }