generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The util scripts need to handled no-hw.

Browse Source 
PR: 327
This commit is contained in:
Richard Levitte 2003-01-30 20:03:45 +00:00
parent db5006df04
commit 5cd48abf9f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/mk1mf.pl
View File

@ -67,6 +67,7 @@ and [options] can be one of
no-ecdsa - No ECDSA no-ecdsa - No ECDSA
no-ecdh - No ECDH no-ecdh - No ECDH
no-engine - No engine no-engine - No engine
no-hw - No hw
nasm - Use NASM for x86 asm nasm - Use NASM for x86 asm
gaswin - Use GNU as with Mingw32 gaswin - Use GNU as with Mingw32
no-socks - No socket code no-socks - No socket code
@ -238,6 +239,7 @@ $cflags.=" -DOPENSSL_NO_EC" if $no_ec;
$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa; $cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh; $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
$cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine;
$cflags.=" -DOPENSSL_NO_HW" if $no_hw;
#$cflags.=" -DRSAref" if $rsaref ne ""; #$cflags.=" -DRSAref" if $rsaref ne "";
## if ($unix) ## if ($unix)
@ -668,6 +670,7 @@ sub var_add
local(@a,$_,$ret); local(@a,$_,$ret);
return("") if $no_engine && $dir =~ /\/engine/; return("") if $no_engine && $dir =~ /\/engine/;
return("") if $no_hw && $dir =~ /\/hw/;
return("") if $no_idea && $dir =~ /\/idea/; return("") if $no_idea && $dir =~ /\/idea/;
return("") if $no_aes && $dir =~ /\/aes/; return("") if $no_aes && $dir =~ /\/aes/;
return("") if $no_rc2 && $dir =~ /\/rc2/; return("") if $no_rc2 && $dir =~ /\/rc2/;
@ -729,6 +732,7 @@ sub var_add
@a=grep(!/_mdc2$/,@a) if $no_mdc2; @a=grep(!/_mdc2$/,@a) if $no_mdc2;
@a=grep(!/^engine$/,@a) if $no_engine; @a=grep(!/^engine$/,@a) if $no_engine;
@a=grep(!/^hw$/,@a) if $no_hw;
@a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa; @a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa;
@a=grep(!/(^dsa$)|(^gendsa$)|(^dsaparam$)/,@a) if $no_dsa; @a=grep(!/(^dsa$)|(^gendsa$)|(^dsaparam$)/,@a) if $no_dsa;
@a=grep(!/^gendsa$/,@a) if $no_sha1; @a=grep(!/^gendsa$/,@a) if $no_sha1;
@ -933,6 +937,7 @@ sub read_options
elsif (/^no-ecdsa$/) { $no_ecdsa=1; } elsif (/^no-ecdsa$/) { $no_ecdsa=1; }
elsif (/^no-ecdh$/) { $no_ecdh=1; } elsif (/^no-ecdh$/) { $no_ecdh=1; }
elsif (/^no-engine$/) { $no_engine=1; } elsif (/^no-engine$/) { $no_engine=1; }
elsif (/^no-hw$/) { $no_hw=1; }
elsif (/^just-ssl$/) { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1; elsif (/^just-ssl$/) { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1;
$no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1; $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1;

6
util/mkdef.pl
View File

@ -93,7 +93,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
# External "algorithms" # External "algorithms"
"FP_API", "STDIO", "SOCK", "KRB5", "FP_API", "STDIO", "SOCK", "KRB5",
# Engines # Engines
"STATIC_ENGINE", "ENGINE", "STATIC_ENGINE", "ENGINE", "HW",
# Deprecated functions # Deprecated functions
"DEPRECATED" ); "DEPRECATED" );
@ -111,7 +111,7 @@ my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf;
my $no_cast; my $no_cast;
my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;
my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
my $no_fp_api; my $no_static_engine; my $no_deprecated; my $no_fp_api; my $no_static_engine; my $no_deprecated;
foreach (@ARGV, split(/ /, $options)) foreach (@ARGV, split(/ /, $options))
@ -183,6 +183,7 @@ foreach (@ARGV, split(/ /, $options))
elsif (/^no-dso$/) { $no_dso=1; } elsif (/^no-dso$/) { $no_dso=1; }
elsif (/^no-krb5$/) { $no_krb5=1; } elsif (/^no-krb5$/) { $no_krb5=1; }
elsif (/^no-engine$/) { $no_engine=1; } elsif (/^no-engine$/) { $no_engine=1; }
elsif (/^no-hw$/) { $no_hw=1; }
} }
@ -1067,6 +1068,7 @@ sub is_valid
if ($keyword eq "DSO" && $no_dso) { return 0; } if ($keyword eq "DSO" && $no_dso) { return 0; }
if ($keyword eq "KRB5" && $no_krb5) { return 0; } if ($keyword eq "KRB5" && $no_krb5) { return 0; }
if ($keyword eq "ENGINE" && $no_engine) { return 0; } if ($keyword eq "ENGINE" && $no_engine) { return 0; }
if ($keyword eq "HW" && $no_hw) { return 0; }
if ($keyword eq "FP_API" && $no_fp_api) { return 0; } if ($keyword eq "FP_API" && $no_fp_api) { return 0; }
if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; } if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }