X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fmkfiles.pl;h=268acadb6292261936a6730fcc1fb956cc7996ed;hb=b0809bc8ffb34bf89de9e68d8caeb4d8c2aa08f9;hp=2d77a82b0c8194eab9d29a3efdc5376e8b7c2661;hpb=558ddad34f59409774511de291b719223e0ed3e5;p=oweals%2Fopenssl.git

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 2d77a82b0c..268acadb62 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -58,22 +58,11 @@ my @dirs = (
 "crypto/engine",
 "crypto/ocsp",
 "crypto/ui",
-"crypto/krb5",
 #"crypto/store",
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
-"fips",
-"fips/aes",
-"fips/des",
-"fips/dsa",
-"fips/dh",
-"fips/ecdsa",
-"fips/hmac",
-"fips/rand",
-"fips/rsa",
-"fips/utl",
-"fips/sha",
+"crypto/srp",
 "ssl",
 "apps",
 "engines",
@@ -84,7 +73,10 @@ my @dirs = (
 
 %top;
 
+my $fipscanisteronly = 0;
+
 foreach (@dirs) {
+	next if ($fipscanisteronly && !(-d $_));
 	&files_dir ($_, "Makefile");
 }
 
@@ -104,7 +96,7 @@ while (<IN>)
 	{
 	chop;
 	s/#.*//;
-	if (/^(\S+)\s*=\s*(.*)$/)
+	if (/^([^\s=]+)\s*=\s*(.*)$/)
 		{
 		$o="";
 		($s,$b)=($1,$2);
@@ -150,4 +142,8 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
+	{
+	$fipscanisteronly = 1;
+	}
 }