projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove generation of ms/version32.rc from Configure, use util/mkrc.pl
[openssl.git]
/
util
/
mkfiles.pl
diff --git
a/util/mkfiles.pl
b/util/mkfiles.pl
index 17b7d46957c4c505d92b4effd357738b171ecb29..0e4f71e04dcadc5a71f8325dc18ce301d0a758ff 100755
(executable)
--- a/
util/mkfiles.pl
+++ b/
util/mkfiles.pl
@@
-34,8
+34,6
@@
my @dirs = (
"crypto/dso",
"crypto/dh",
"crypto/ec",
"crypto/dso",
"crypto/dh",
"crypto/ec",
-"crypto/ecdh",
-"crypto/ecdsa",
"crypto/buffer",
"crypto/bio",
"crypto/stack",
"crypto/buffer",
"crypto/bio",
"crypto/stack",
@@
-50,7
+48,6
@@
my @dirs = (
"crypto/x509v3",
"crypto/cms",
"crypto/conf",
"crypto/x509v3",
"crypto/cms",
"crypto/conf",
-"crypto/jpake",
"crypto/txt_db",
"crypto/pkcs7",
"crypto/pkcs12",
"crypto/txt_db",
"crypto/pkcs7",
"crypto/pkcs12",
@@
-58,27
+55,19
@@
my @dirs = (
"crypto/engine",
"crypto/ocsp",
"crypto/ui",
"crypto/engine",
"crypto/ocsp",
"crypto/ui",
-"crypto/krb5",
#"crypto/store",
#"crypto/store",
-"crypto/pqueue",
"crypto/whrlpool",
"crypto/ts",
"crypto/srp",
"crypto/whrlpool",
"crypto/ts",
"crypto/srp",
-"fips",
-"fips/aes",
-"fips/des",
-"fips/dsa",
-"fips/dh",
-"fips/ecdsa",
-"fips/hmac",
-"fips/rand",
-"fips/rsa",
-"fips/utl",
-"fips/sha",
+"crypto/ct",
+"crypto/async",
+"crypto/chacha",
+"crypto/poly1305",
+"crypto/blake2",
+"crypto/kdf",
"ssl",
"apps",
"engines",
"ssl",
"apps",
"engines",
-"engines/ccgost",
"test",
"tools"
);
"test",
"tools"
);
@@
-106,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);
@@
-116,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
{
@@
-154,7
+143,7
@@
if ($dir eq "." && defined($sym{"BUILDENV"}))
print "RELATIVE_DIRECTORY=\n";
close (IN);
print "RELATIVE_DIRECTORY=\n";
close (IN);
-if ($dir eq "." && $sym{
CONFIGURE_ARGS} =~ /fipscanisteronly/
)
+if ($dir eq "." && $sym{
FIPSCANISTERONLY} eq "y"
)
{
$fipscanisteronly = 1;
}
{
$fipscanisteronly = 1;
}