X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=util%2Fmkfiles.pl;h=0e4f71e04dcadc5a71f8325dc18ce301d0a758ff;hb=53a51674585a394726625324c0a1bd08ac80245b;hp=bc17462033012ff02b1c63b896eabc5b3362e69e;hpb=2fb5535e64c395f01151315474fd10574677e3d6;p=openssl.git

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index bc17462033..0e4f71e04d 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -48,7 +48,6 @@ my @dirs = (
 "crypto/x509v3",
 "crypto/cms",
 "crypto/conf",
-"crypto/jpake",
 "crypto/txt_db",
 "crypto/pkcs7",
 "crypto/pkcs12",
@@ -57,7 +56,6 @@ my @dirs = (
 "crypto/ocsp",
 "crypto/ui",
 #"crypto/store",
-"crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
 "crypto/srp",
@@ -65,10 +63,11 @@ my @dirs = (
 "crypto/async",
 "crypto/chacha",
 "crypto/poly1305",
+"crypto/blake2",
+"crypto/kdf",
 "ssl",
 "apps",
 "engines",
-"engines/ccgost",
 "test",
 "tools"
 );
@@ -96,7 +95,7 @@ my $s="";
 
 while (<IN>)
 	{
-	chop;
+	s|\R$||;
 	s/#.*//;
 	if (/^([^\s=]+)\s*=\s*(.*)$/)
 		{
@@ -106,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
 				{