diff options
author | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
commit | e393e47b1e23744a7d0ed999afb5d137070f5f8f (patch) | |
tree | 9739a803477c4610ec6628d914bdcc55fbb3602a /crypto/openssl/util/mkfiles.pl | |
parent | a8b00dea2cde4c3d96e6ed1de530ddff21012266 (diff) | |
parent | 532b4084cb8cac5e6d91d42aa6a497dd4ba4a4f5 (diff) | |
download | FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.zip FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.tar.gz |
Merge OpenSSL 1.0.1c.
Approved by: benl (maintainer)
Diffstat (limited to 'crypto/openssl/util/mkfiles.pl')
-rwxr-xr-x | crypto/openssl/util/mkfiles.pl | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/crypto/openssl/util/mkfiles.pl b/crypto/openssl/util/mkfiles.pl index 67fb869..7d9a9d5 100755 --- a/crypto/openssl/util/mkfiles.pl +++ b/crypto/openssl/util/mkfiles.pl @@ -15,6 +15,7 @@ my @dirs = ( "crypto/sha", "crypto/mdc2", "crypto/hmac", +"crypto/cmac", "crypto/ripemd", "crypto/des", "crypto/rc2", @@ -26,6 +27,7 @@ my @dirs = ( "crypto/aes", "crypto/camellia", "crypto/seed", +"crypto/modes", "crypto/bn", "crypto/rsa", "crypto/dsa", @@ -46,6 +48,7 @@ my @dirs = ( "crypto/pem", "crypto/x509", "crypto/x509v3", +"crypto/cms", "crypto/conf", "crypto/jpake", "crypto/txt_db", @@ -56,25 +59,21 @@ my @dirs = ( "crypto/ocsp", "crypto/ui", "crypto/krb5", -"crypto/store", +#"crypto/store", "crypto/pqueue", -"crypto/cms", -"fips", -"fips/aes", -"fips/des", -"fips/dsa", -"fips/dh", -"fips/hmac", -"fips/rand", -"fips/rsa", -"fips/sha", +"crypto/whrlpool", +"crypto/ts", +"crypto/srp", "ssl", "apps", "engines", +"engines/ccgost", "test", "tools" ); +%top; + foreach (@dirs) { &files_dir ($_, "Makefile"); } @@ -118,8 +117,8 @@ while (<IN>) $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); } } @@ -129,6 +128,15 @@ foreach (sort keys %sym) { print "$_=$sym{$_}\n"; } +if ($dir eq "." && defined($sym{"BUILDENV"})) + { + foreach (split(' ',$sym{"BUILDENV"})) + { + /^(.+)=/; + $top{$1}=$sym{$1}; + } + } + print "RELATIVE_DIRECTORY=\n"; close (IN); |