projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update ordinals
[openssl.git]
/
util
/
mkfiles.pl
diff --git
a/util/mkfiles.pl
b/util/mkfiles.pl
index 0e174a6d26f10e73eae25ad047d413d09cddfc75..a81434b2cf5d12006297761e7ff3c08e86d68816 100755
(executable)
--- a/
util/mkfiles.pl
+++ b/
util/mkfiles.pl
@@
-23,13
+23,19
@@
my @dirs = (
"crypto/idea",
"crypto/bf",
"crypto/cast",
"crypto/idea",
"crypto/bf",
"crypto/cast",
-"crypto/rijndael",
+"crypto/aes",
+"crypto/camellia",
+"crypto/seed",
+"crypto/modes",
+"crypto/cmac",
"crypto/bn",
"crypto/rsa",
"crypto/dsa",
"crypto/dso",
"crypto/dh",
"crypto/ec",
"crypto/bn",
"crypto/rsa",
"crypto/dsa",
"crypto/dso",
"crypto/dh",
"crypto/ec",
+"crypto/ecdh",
+"crypto/ecdsa",
"crypto/buffer",
"crypto/bio",
"crypto/stack",
"crypto/buffer",
"crypto/bio",
"crypto/stack",
@@
-42,21
+48,37
@@
my @dirs = (
"crypto/pem",
"crypto/x509",
"crypto/x509v3",
"crypto/pem",
"crypto/x509",
"crypto/x509v3",
+"crypto/cms",
"crypto/conf",
"crypto/conf",
+"crypto/jpake",
"crypto/txt_db",
"crypto/pkcs7",
"crypto/pkcs12",
"crypto/comp",
"crypto/engine",
"crypto/ocsp",
"crypto/txt_db",
"crypto/pkcs7",
"crypto/pkcs12",
"crypto/comp",
"crypto/engine",
"crypto/ocsp",
+"crypto/ui",
+"crypto/krb5",
+#"crypto/store",
+"crypto/pqueue",
+"crypto/whrlpool",
+"crypto/ts",
+"crypto/srp",
"ssl",
"apps",
"ssl",
"apps",
+"engines",
+"engines/ccgost",
"test",
"tools"
);
"test",
"tools"
);
+%top;
+
+my $fipscanisteronly = 0;
+
foreach (@dirs) {
foreach (@dirs) {
- &files_dir ($_, "Makefile.ssl");
+ next if ($fipscanisteronly && !(-d $_));
+ &files_dir ($_, "Makefile");
}
exit(0);
}
exit(0);
@@
-75,7
+97,7
@@
while (<IN>)
{
chop;
s/#.*//;
{
chop;
s/#.*//;
- if (/^(
\S
+)\s*=\s*(.*)$/)
+ if (/^(
[^\s=]
+)\s*=\s*(.*)$/)
{
$o="";
($s,$b)=($1,$2);
{
$o="";
($s,$b)=($1,$2);
@@
-98,8
+120,8
@@
while (<IN>)
$o =~ s/\s+$//;
$o =~ s/\s+/ /g;
$o =~ s/\s+$//;
$o =~ s/\s+/ /g;
- $o =~ s/\$[({]([^)}]+)[)}]/$
sym{$1}/g
;
- $sym{$s}=
$o
;
+ $o =~ s/\$[({]([^)}]+)[)}]/$
top{$1} or $sym{$1}/ge
;
+ $sym{$s}=
($top{$s} or $o)
;
}
}
}
}
@@
-109,7
+131,20
@@
foreach (sort keys %sym)
{
print "$_=$sym{$_}\n";
}
{
print "$_=$sym{$_}\n";
}
+if ($dir eq "." && defined($sym{"BUILDENV"}))
+ {
+ foreach (split(' ',$sym{"BUILDENV"}))
+ {
+ /^(.+)=/;
+ $top{$1}=$sym{$1};
+ }
+ }
+
print "RELATIVE_DIRECTORY=\n";
close (IN);
print "RELATIVE_DIRECTORY=\n";
close (IN);
+if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
+ {
+ $fipscanisteronly = 1;
+ }
}
}