projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some issues near recent chomp changes.
[openssl.git]
/
util
/
mkfiles.pl
diff --git
a/util/mkfiles.pl
b/util/mkfiles.pl
index cb537c347fca6362f9aef0e1aa6ef686e5acfaf5..55dfbc64e376acd12a77adeaf3c3df7d5d4b4f4e 100755
(executable)
--- a/
util/mkfiles.pl
+++ b/
util/mkfiles.pl
@@
-24,14
+24,16
@@
my @dirs = (
"crypto/bf",
"crypto/cast",
"crypto/aes",
"crypto/bf",
"crypto/cast",
"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",
@@
-44,7
+46,9
@@
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/txt_db",
"crypto/pkcs7",
"crypto/pkcs12",
@@
-52,10
+56,15
@@
my @dirs = (
"crypto/engine",
"crypto/ocsp",
"crypto/ui",
"crypto/engine",
"crypto/ocsp",
"crypto/ui",
-"crypto/krb5",
-"crypto/store",
-"crypto/pqueue",
+#"crypto/store",
"crypto/whrlpool",
"crypto/whrlpool",
+"crypto/ts",
+"crypto/srp",
+"crypto/ct",
+"crypto/async",
+"crypto/chacha",
+"crypto/poly1305",
+"crypto/kdf",
"ssl",
"apps",
"engines",
"ssl",
"apps",
"engines",
@@
-63,7
+72,12
@@
my @dirs = (
"tools"
);
"tools"
);
+%top;
+
+my $fipscanisteronly = 0;
+
foreach (@dirs) {
foreach (@dirs) {
+ next if ($fipscanisteronly && !(-d $_));
&files_dir ($_, "Makefile");
}
&files_dir ($_, "Makefile");
}
@@
-81,9
+95,9
@@
my $s="";
while (<IN>)
{
while (<IN>)
{
-
chop
;
+
s|\R$||
;
s/#.*//;
s/#.*//;
- if (/^(
\S
+)\s*=\s*(.*)$/)
+ if (/^(
[^\s=]
+)\s*=\s*(.*)$/)
{
$o="";
($s,$b)=($1,$2);
{
$o="";
($s,$b)=($1,$2);
@@
-91,10
+105,10
@@
while (<IN>)
{
if ($b =~ /\\$/)
{
{
if ($b =~ /\\$/)
{
-
chop($b)
;
+
$b=$`
;
$o.=$b." ";
$o.=$b." ";
- $b
=<IN>
;
-
chop($b)
;
+ $b
= "" unless defined($b = <IN>)
;
+
$b =~ s{\R$}{}
;
}
else
{
}
else
{
@@
-106,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)
;
}
}
}
}
@@
-117,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;
+ }
}
}