abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-13 03:46:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix

Browse Source 
Thanks to github.com/Jkinglyf
This commit is contained in:
Zhi Guan
2016-05-30 12:50:06 +02:00
parent ee4384daeb
commit 2bf25bd29f
55 changed files with 2044 additions and 1672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
util/mk1mf.pl
View File

@@ -108,10 +108,9 @@ foreach (@ARGV)
print STDERR <<"EOF";
and [options] can be one of
no-md2 no-md4 no-md5 no-sha no-mdc2 - Skip this digest
no-ripemd no-sm3
no-ripemd
no-rc2 no-rc4 no-rc5 no-idea no-des - Skip this symetric cipher
no-bf no-cast no-aes no-camellia no-seed
no-sms4 no-zuc
no-rsa no-dsa no-dh - Skip this public key cipher
no-ssl2 no-ssl3 - Skip this version of SSL
just-ssl - remove all non-ssl keys/digest
@@ -121,9 +120,6 @@ and [options] can be one of
no-ec - No EC
no-ecdsa - No ECDSA
no-ecdh - No ECDH
no-ecies - No ECIES
no-sm2 - No SM2
no-cpk - No CPK
no-engine - No engine
no-hw - No hw
nasm - Use NASM for x86 asm
@@ -296,12 +292,6 @@ $cflags.=" -DOPENSSL_NO_JPAKE" if $no_jpake;
$cflags.=" -DOPENSSL_NO_EC2M" if $no_ec2m;
$cflags.= " -DZLIB" if $zlib_opt;
$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
$cflags.=" -DOPENSSL_NO_SM2" if $no_sm2;
$cflags.=" -DOPENSSL_NO_SM3" if $no_sm3;
$cflags.=" -DOPENSSL_NO_SMS4" if $no_sms4;
$cflags.=" -DOPENSSL_NO_ZUC" if $no_zuc;
$cflags.=" -DOPENSSL_NO_ECIES" if $no_ecies;
$cflags.=" -DOPENSSL_NO_CPK" if $no_cpk;
if ($no_static_engine)
{
@@ -924,13 +914,6 @@ sub var_add
@a=grep(!/(^dh)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;
@a=grep(!/(^sm2)|(_sm2$)/,@a) if $no_sm2;
@a=grep(!/(^sm3)|(_sm3$)/,@a) if $no_sm3;
@a=grep(!/(^sms4)|(_sms4$)/,@a) if $no_sms4;
@a=grep(!/(^zuc)|(_zuc$)/,@a) if $no_zuc;
@a=grep(!/(^ecies)|(_ecies$)/,@a) if $no_ecies;
@a=grep(!/(^cpk)|(_cpk$)/,@a) if $no_cpk;
grep($_="$dir/$_",@a);
@a=grep(!/(^|\/)s_/,@a) if $no_sock;
@a=grep(!/(^|\/)bio_sock/,@a) if $no_sock;
@@ -1257,13 +1240,7 @@ sub read_options
"no-unit-test" => 0,
"no-libunbound" => 0,
"no-multiblock" => 0,
"fips" => \$fips,
"no-sm2" => \$no_sm2,
"no-sm3" => \$no_sm3,
"no-sms4" => \$no_sms4,
"no-zuc" => \$no_zuc
"no-ecies" => \$no_ecies
"no-cpk" => \$no_cpk
"fips" => \$fips
);
if (exists $valid_options{$_})