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

update

Browse Source
This commit is contained in:
Zhi Guan
2015-10-07 15:23:34 +08:00
parent 254a1266d6
commit b4ad0da508
27 changed files with 590 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/mk1mf.pl
View File

@@ -121,6 +121,8 @@ and [options] can be one of
no-ec - No EC
no-ecdsa - No ECDSA
no-ecdh - No ECDH
no-ecies - No ECIES
no-cpk - No CPK
no-engine - No engine
no-hw - No hw
nasm - Use NASM for x86 asm
@@ -296,6 +298,8 @@ $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
$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)
{
@@ -921,6 +925,8 @@ sub var_add
@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;
@@ -1252,6 +1258,8 @@ sub read_options
"no-sm3" => \$no_sm3,
"no-sms4" => \$no_sms4,
"no-zuc" => \$no_zuc
"no-ecies" => \$no_ecies
"no-cpk" => \$no_cpk
);
if (exists $valid_options{$_})

17
util/mkdef.pl
View File

@@ -146,7 +146,7 @@ my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc;
my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace;
my $no_unit_test; my $no_ssl3_method;
my $no_sm3; my $no_sms4; my $no_zuc;
my $no_sm3; my $no_sms4; my $no_zuc; my $no_ecies; my $no_cpk;
my $fips;
@@ -252,6 +252,8 @@ foreach (@ARGV, split(/ /, $options))
elsif (/^no-sm3$/) { $no_sm3=1; }
elsif (/^no-sms4$/) { $no_sms4=1; }
elsif (/^no-zuc$/) { $no_zuc=1; }
elsif (/^no-ecies$/) { $no_ecies=1; }
elsif (/^no-cpk$/) { $no_cpk=1; }
}
@@ -319,8 +321,6 @@ $crypto.=" crypto/dsa/dsa.h" ; # unless $no_dsa;
$crypto.=" crypto/dh/dh.h" ; # unless $no_dh;
$crypto.=" crypto/ec/ec.h" ; # unless $no_ec;
$crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa;
$crypto.=" crypto/ecies/ecies.h" ;
$crypto.=" crypto/ecies/kdf.h" ;
$crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh;
$crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac;
$crypto.=" crypto/cmac/cmac.h" ; # unless $no_hmac;
@@ -360,9 +360,12 @@ $crypto.=" crypto/jpake/jpake.h";
$crypto.=" crypto/modes/modes.h";
$crypto.=" crypto/srp/srp.h";
$crypto.=" crypto/sm3/sm3.h" ; # unless $no_sm3;
$crypto.=" crypto/sms4/sms4.h" ; # unless $no_sms4;
$crypto.=" crypto/zuc/zuc.h" ; # unless $no_zuc;
$crypto.=" crypto/sm3/sm3.h"; # unless $no_sm3;
$crypto.=" crypto/sms4/sms4.h"; # unless $no_sms4;
$crypto.=" crypto/zuc/zuc.h"; # unless $no_zuc;
$crypto.=" crypto/ecies/ecies.h";
$crypto.=" crypto/ecies/kdf.h";
$crypto.=" crypto/ecies/cpk.h";
my $symhacks="crypto/symhacks.h";
@@ -1240,6 +1243,8 @@ sub is_valid
if ($keyword eq "SM3" && $no_sm3) { return 0; }
if ($keyword eq "SMS4" && $no_sms4) { return 0; }
if ($keyword eq "ZUC" && $no_zuc) { return 0; }
if ($keyword eq "ECIES" && $no_ecies) { return 0; }
if ($keyword eq "CPK" && $no_cpk) { return 0; }
# Nothing recognise as true
return 1;

1
util/mkfiles.pl
View File

@@ -40,6 +40,7 @@ my @dirs = (
"crypto/ecdh",
"crypto/ecdsa",
"crypto/ecies",
"crypto/cpk",
"crypto/buffer",
"crypto/bio",
"crypto/stack",