mirror of
https://github.com/QuasarApp/openssl.git
synced 2025-04-30 03:34:39 +00:00
Make apps/progs.pl more flexible
Make Configure write @disablables to configdata.pm and have apps/progs.pl use that data. Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte
parent
d4037cea3c
commit
3850f8cb15
10
Configure
10
Configure
@ -1664,7 +1664,7 @@ use warnings;
|
|||||||
use Exporter;
|
use Exporter;
|
||||||
#use vars qw(\@ISA \@EXPORT);
|
#use vars qw(\@ISA \@EXPORT);
|
||||||
our \@ISA = qw(Exporter);
|
our \@ISA = qw(Exporter);
|
||||||
our \@EXPORT = qw(\%config \%target \%disabled \%withargs \%unified_info);
|
our \@EXPORT = qw(\%config \%target \%disabled \%withargs \%unified_info \@disablables);
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
print OUT "our %config = (\n";
|
print OUT "our %config = (\n";
|
||||||
@ -1701,6 +1701,14 @@ print OUT " dtls => [ ", join(", ", map { quotify("perl", $_) } @dtls), " ],\n"
|
|||||||
print OUT <<"EOF";
|
print OUT <<"EOF";
|
||||||
);
|
);
|
||||||
|
|
||||||
|
EOF
|
||||||
|
print OUT "our \@disablables = (\n";
|
||||||
|
foreach (@disablables) {
|
||||||
|
print OUT " ", quotify("perl", $_), ",\n";
|
||||||
|
}
|
||||||
|
print OUT <<"EOF";
|
||||||
|
);
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
print OUT "our \%disabled = (\n";
|
print OUT "our \%disabled = (\n";
|
||||||
foreach (sort keys %disabled) {
|
foreach (sort keys %disabled) {
|
||||||
|
|||||||
128
apps/progs.pl
128
apps/progs.pl
@ -1,9 +1,19 @@
|
|||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
# Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the OpenSSL licenses, (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
# https://www.openssl.org/source/license.html
|
||||||
|
# or in the file LICENSE in the source distribution.
|
||||||
|
|
||||||
# Generate progs.h file by looking for command mains in list of C files
|
# Generate progs.h file by looking for command mains in list of C files
|
||||||
# passed on the command line.
|
# passed on the command line.
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
use configdata qw/@disablables/;
|
||||||
|
|
||||||
my %commands = ();
|
my %commands = ();
|
||||||
my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
|
my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
|
||||||
@ -22,8 +32,13 @@ foreach my $filename (@ARGV) {
|
|||||||
print <<'EOF';
|
print <<'EOF';
|
||||||
/*
|
/*
|
||||||
* Automatically generated by progs.pl for openssl.c
|
* Automatically generated by progs.pl for openssl.c
|
||||||
* Copyright (c) 2008 The OpenSSL Project. All rights reserved.
|
* Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* See the openssl.c for copyright details.
|
*
|
||||||
|
* Licensed under the OpenSSL licenses, (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
* https://www.openssl.org/source/license.html
|
||||||
|
* or in the file LICENSE in the source distribution.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef enum FUNC_TYPE {
|
typedef enum FUNC_TYPE {
|
||||||
@ -51,54 +66,63 @@ print "\n";
|
|||||||
foreach (@ARGV) {
|
foreach (@ARGV) {
|
||||||
printf "extern OPTIONS %s_options[];\n", $_;
|
printf "extern OPTIONS %s_options[];\n", $_;
|
||||||
}
|
}
|
||||||
print "\n#ifdef INCLUDE_FUNCTION_TABLE\n";
|
|
||||||
print "static FUNCTION functions[] = {\n";
|
my %cmd_disabler = (
|
||||||
foreach (@ARGV) {
|
ciphers => "sock",
|
||||||
my $str=" { FT_general, \"$_\", ${_}_main, ${_}_options },\n";
|
genrsa => "rsa",
|
||||||
if (/^s_/ || /^ciphers$/) {
|
rsautl => "rsa",
|
||||||
print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n";
|
gendsa => "dsa",
|
||||||
} elsif (/^engine$/) {
|
dsaparam => "dsa",
|
||||||
print "#ifndef OPENSSL_NO_ENGINE\n${str}#endif\n";
|
gendh => "dh",
|
||||||
} elsif (/^rsa$/ || /^genrsa$/ || /^rsautl$/) {
|
dhparam => "dh",
|
||||||
print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n";
|
ecparam => "ec",
|
||||||
} elsif (/^dsa$/ || /^gendsa$/ || /^dsaparam$/) {
|
pkcs12 => "des",
|
||||||
print "#ifndef OPENSSL_NO_DSA\n${str}#endif\n";
|
);
|
||||||
} elsif (/^ec$/ || /^ecparam$/) {
|
print "\nstatic FUNCTION functions[] = {\n";
|
||||||
print "#ifndef OPENSSL_NO_EC\n${str}#endif\n";
|
foreach my $cmd (@ARGV) {
|
||||||
} elsif (/^dh$/ || /^gendh$/ || /^dhparam$/) {
|
my $str=" { FT_general, \"$cmd\", ${cmd}_main, ${cmd}_options },\n";
|
||||||
print "#ifndef OPENSSL_NO_DH\n${str}#endif\n";
|
if ($cmd =~ /^s_/) {
|
||||||
} elsif (/^pkcs12$/) {
|
print "#ifndef OPENSSL_NO_SOCK\n${str}#endif\n";
|
||||||
print "#if !defined(OPENSSL_NO_DES)\n${str}#endif\n";
|
} elsif (grep { $cmd eq $_ } @disablables) {
|
||||||
} elsif (/^cms$/) {
|
print "#ifndef OPENSSL_NO_".uc($cmd)."\n${str}#endif\n";
|
||||||
print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n";
|
} elsif (my $disabler = $cmd_disabler{$cmd}) {
|
||||||
} elsif (/^ocsp$/) {
|
print "#ifndef OPENSSL_NO_".uc($disabler)."\n${str}#endif\n";
|
||||||
print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n";
|
|
||||||
} elsif (/^srp$/) {
|
|
||||||
print "#ifndef OPENSSL_NO_SRP\n${str}#endif\n";
|
|
||||||
} elsif (/^ts$/) {
|
|
||||||
print "#ifndef OPENSSL_NO_TS\n${str}#endif\n";
|
|
||||||
} else {
|
} else {
|
||||||
print $str;
|
print $str;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (
|
my %md_disabler = (
|
||||||
|
sha1 => "sha",
|
||||||
|
sha224 => "sha",
|
||||||
|
sha256 => "sha",
|
||||||
|
sha384 => "sha",
|
||||||
|
sha512 => "sha",
|
||||||
|
blake2b512 => "blake2",
|
||||||
|
blake2s256 => "blake2",
|
||||||
|
);
|
||||||
|
foreach my $cmd (
|
||||||
"md2", "md4", "md5",
|
"md2", "md4", "md5",
|
||||||
"md_ghost94",
|
"md_ghost94",
|
||||||
"sha1", "sha224", "sha256", "sha384", "sha512",
|
"sha1", "sha224", "sha256", "sha384", "sha512",
|
||||||
"mdc2", "rmd160", "blake2b512", "blake2s256"
|
"mdc2", "rmd160", "blake2b512", "blake2s256"
|
||||||
) {
|
) {
|
||||||
my $str = " { FT_md, \"".$_."\", dgst_main},\n";
|
my $str = " { FT_md, \"".$cmd."\", dgst_main},\n";
|
||||||
if (/blake2/) {
|
if (grep { $cmd eq $_ } @disablables) {
|
||||||
print "#ifndef OPENSSL_NO_BLAKE2\n${str}#endif\n";
|
print "#ifndef OPENSSL_NO_".uc($cmd)."\n${str}#endif\n";
|
||||||
} elsif (/sha/) {
|
} elsif (my $disabler = $md_disabler{$cmd}) {
|
||||||
print "${str}";
|
print "#ifndef OPENSSL_NO_".uc($disabler)."\n${str}#endif\n";
|
||||||
} else {
|
} else {
|
||||||
print "#ifndef OPENSSL_NO_".uc($_)."\n${str}#endif\n";
|
print "#ifndef OPENSSL_NO_".uc($cmd)."\n${str}#endif\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (
|
my %cipher_disabler = (
|
||||||
|
des3 => "des",
|
||||||
|
desx => "des",
|
||||||
|
cast5 => "cast",
|
||||||
|
);
|
||||||
|
foreach my $cmd (
|
||||||
"aes-128-cbc", "aes-128-ecb",
|
"aes-128-cbc", "aes-128-ecb",
|
||||||
"aes-192-cbc", "aes-192-ecb",
|
"aes-192-cbc", "aes-192-ecb",
|
||||||
"aes-256-cbc", "aes-256-ecb",
|
"aes-256-cbc", "aes-256-ecb",
|
||||||
@ -119,33 +143,17 @@ foreach (
|
|||||||
"cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
|
"cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
|
||||||
"cast-cbc", "rc5-cbc", "rc5-ecb", "rc5-cfb", "rc5-ofb"
|
"cast-cbc", "rc5-cbc", "rc5-ecb", "rc5-cfb", "rc5-ofb"
|
||||||
) {
|
) {
|
||||||
my $str=" { FT_cipher, \"$_\", enc_main, enc_options },\n";
|
my $str=" { FT_cipher, \"$cmd\", enc_main, enc_options },\n";
|
||||||
if (/des/) {
|
(my $algo= $cmd) =~ s/-.*//g;
|
||||||
printf "#ifndef OPENSSL_NO_DES\n${str}#endif\n";
|
if ($cmd eq "zlib") {
|
||||||
} elsif (/aes/) {
|
print "#ifdef ZLIB\n${str}#endif\n";
|
||||||
printf "#ifndef OPENSSL_NO_AES\n${str}#endif\n";
|
} elsif (grep { $algo eq $_ } @disablables) {
|
||||||
} elsif (/camellia/) {
|
print "#ifndef OPENSSL_NO_".uc($algo)."\n${str}#endif\n";
|
||||||
printf "#ifndef OPENSSL_NO_CAMELLIA\n${str}#endif\n";
|
} elsif (my $disabler = $cipher_disabler{$algo}) {
|
||||||
} elsif (/idea/) {
|
print "#ifndef OPENSSL_NO_".uc($disabler)."\n${str}#endif\n";
|
||||||
printf "#ifndef OPENSSL_NO_IDEA\n${str}#endif\n";
|
|
||||||
} elsif (/seed/) {
|
|
||||||
printf "#ifndef OPENSSL_NO_SEED\n${str}#endif\n";
|
|
||||||
} elsif (/rc4/) {
|
|
||||||
printf "#ifndef OPENSSL_NO_RC4\n${str}#endif\n";
|
|
||||||
} elsif (/rc2/) {
|
|
||||||
printf "#ifndef OPENSSL_NO_RC2\n${str}#endif\n";
|
|
||||||
} elsif (/bf/) {
|
|
||||||
printf "#ifndef OPENSSL_NO_BF\n${str}#endif\n";
|
|
||||||
} elsif (/cast/) {
|
|
||||||
printf "#ifndef OPENSSL_NO_CAST\n${str}#endif\n";
|
|
||||||
} elsif (/rc5/) {
|
|
||||||
printf "#ifndef OPENSSL_NO_RC5\n${str}#endif\n";
|
|
||||||
} elsif (/zlib/) {
|
|
||||||
printf "#ifdef ZLIB\n${str}#endif\n";
|
|
||||||
} else {
|
} else {
|
||||||
print $str;
|
print $str;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
print " { 0, NULL, NULL}\n};\n";
|
print " { 0, NULL, NULL}\n};\n";
|
||||||
printf "#endif\n";
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user