X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=util%2Fmkfiles.pl;h=a81434b2cf5d12006297761e7ff3c08e86d68816;hp=823676c60bf9809e16593833d1b4ceaba140be29;hb=8817e2e0c998757d3bd036d7f45fe8d0a49fbe2d;hpb=4287ade5b451c94337f4b0fe842acd96fe0b97f5

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 823676c60b..a81434b2cf 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -26,6 +26,8 @@ my @dirs = (
 "crypto/aes",
 "crypto/camellia",
 "crypto/seed",
+"crypto/modes",
+"crypto/cmac",
 "crypto/bn",
 "crypto/rsa",
 "crypto/dsa",
@@ -46,7 +48,9 @@ my @dirs = (
 "crypto/pem",
 "crypto/x509",
 "crypto/x509v3",
+"crypto/cms",
 "crypto/conf",
+"crypto/jpake",
 "crypto/txt_db",
 "crypto/pkcs7",
 "crypto/pkcs12",
@@ -55,10 +59,11 @@ my @dirs = (
 "crypto/ocsp",
 "crypto/ui",
 "crypto/krb5",
-"crypto/store",
+#"crypto/store",
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
+"crypto/srp",
 "ssl",
 "apps",
 "engines",
@@ -69,7 +74,10 @@ my @dirs = (
 
 %top;
 
+my $fipscanisteronly = 0;
+
 foreach (@dirs) {
+	next if ($fipscanisteronly && !(-d $_));
 	&files_dir ($_, "Makefile");
 }
 
@@ -89,7 +97,7 @@ while (<IN>)
 	{
 	chop;
 	s/#.*//;
-	if (/^(\S+)\s*=\s*(.*)$/)
+	if (/^([^\s=]+)\s*=\s*(.*)$/)
 		{
 		$o="";
 		($s,$b)=($1,$2);
@@ -135,4 +143,8 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
+	{
+	$fipscanisteronly = 1;
+	}
 }