X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=util%2Fmkfiles.pl;h=0e4f71e04dcadc5a71f8325dc18ce301d0a758ff;hp=1c8493ae2209cfa91a2767fb303ed368a119f068;hb=0ef1ce49eeed417c143a8c1bf77ce0d843306e3d;hpb=befcced53ebbd561de96c83020d625721670d40b

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 1c8493ae22..0e4f71e04d 100755
--- 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",
@@ -50,7 +48,6 @@ my @dirs = (
 "crypto/x509v3",
 "crypto/cms",
 "crypto/conf",
-"crypto/jpake",
 "crypto/txt_db",
 "crypto/pkcs7",
 "crypto/pkcs12",
@@ -58,28 +55,19 @@ my @dirs = (
 "crypto/engine",
 "crypto/ocsp",
 "crypto/ui",
-"crypto/krb5",
 #"crypto/store",
-"crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
 "crypto/srp",
-"fips",
-"fips/aes",
-"fips/cmac",
-"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/blake2",
+"crypto/kdf",
 "ssl",
 "apps",
 "engines",
-"engines/ccgost",
 "test",
 "tools"
 );
@@ -107,9 +95,9 @@ my $s="";
 
 while (<IN>)
 	{
-	chop;
+	s|\R$||;
 	s/#.*//;
-	if (/^(\S+)\s*=\s*(.*)$/)
+	if (/^([^\s=]+)\s*=\s*(.*)$/)
 		{
 		$o="";
 		($s,$b)=($1,$2);
@@ -117,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
 				{
@@ -155,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;
 	}