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

update curve wapip192v1 OID

Browse Source
This commit is contained in:
Zhi Guan
2017-11-27 12:36:32 +08:00
parent ed7bf9302f
commit aa97769318
7 changed files with 151 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
apps/openssl.cnf
View File

@@ -347,42 +347,3 @@ tsa_name = yes # Must the TSA name be included in the reply?
# (optional, default: no)
ess_cert_id_chain = no # Must the ESS cert id chain be included?
# (optional, default: no)
[openssl_init]
engines = engine_section
[engine_section]
skf = skf_section
[pkcs11_section]
engine_id = pkcs11
dynamic_path = /usr/lib/engines/engine_pkcs11.so
MODULE_PATH = /usr/local/lib/opensc-pkcs11.so
PIN = 123456
init = 0
[sdf_section]
engine_id = sdf
SO_PATH = /Users/guanzhi/code/github/GmSSL-Private/engines/sdf_dummy.dylib
VENDOR = sansec
OPEN_DEV =
init = 1
[skf_section]
engine_id = skf
VERBOSE = 2
SO_PATH = /home/guanzhi/code/github/GmSSL-Private/engines/libSKF_final.so
SET_AUTHKEY = 31323334353637383132333435363738
OPEN_DEV = /media/guanzhi/Factory
OPEN_APP = myApp1
init = 1
#[req]
#distinguished_name = req_distinguished_name
#
#[req_distinguished_name]

16
apps/speed.c
View File

@@ -399,7 +399,7 @@ static int found(const char *name, const OPT_PAIR *pairs, int *result)
typedef enum OPTION_choice {
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
OPT_ELAPSED, OPT_EVP, OPT_DECRYPT, OPT_ENGINE, OPT_MULTI,
OPT_MR, OPT_MB, OPT_MISALIGN, OPT_ASYNCJOBS
OPT_MR, OPT_MB, OPT_MISALIGN, OPT_ASYNCJOBS, OPT_NOPRE
} OPTION_CHOICE;
OPTIONS speed_options[] = {
@@ -409,6 +409,7 @@ OPTIONS speed_options[] = {
{"evp", OPT_EVP, 's', "Use specified EVP cipher"},
{"decrypt", OPT_DECRYPT, '-',
"Time decryption instead of encryption (only EVP)"},
{"nopre", OPT_NOPRE, '-', "Disable pre-compute"},
{"mr", OPT_MR, '-', "Produce machine readable output"},
{"mb", OPT_MB, '-',
"Enable (tls1.1) multi-block mode on evp_cipher requested with -evp"},
@@ -1408,6 +1409,7 @@ int speed_main(int argc, char **argv)
double d = 0.0;
OPTION_CHOICE o;
int multiblock = 0, pr_header = 0;
int nopre = 0;
int doit[ALGOR_NUM] = { 0 };
int ret = 1, i, k, misalign = 0;
long count = 0;
@@ -1634,6 +1636,9 @@ int speed_main(int argc, char **argv)
goto end;
#endif
break;
case OPT_NOPRE:
nopre = 1;
break;
}
}
argc = opt_num_rest();
@@ -2771,7 +2776,8 @@ int speed_main(int argc, char **argv)
rsa_count = 1;
} else {
for (i = 0; i < loopargs_len; i++) {
EC_KEY_precompute_mult(loopargs[i].ecdsa[testnum], NULL);
if (!nopre)
EC_KEY_precompute_mult(loopargs[i].ecdsa[testnum], NULL);
/* Perform ECDSA signature test */
EC_KEY_generate_key(loopargs[i].ecdsa[testnum]);
st = ECDSA_sign(0, loopargs[i].buf, 20, loopargs[i].buf2,
@@ -2953,7 +2959,8 @@ int speed_main(int argc, char **argv)
rsa_count = 1;
} else {
for (i = 0; i < loopargs_len; i++) {
EC_KEY_precompute_mult(loopargs[i].sm2[testnum], NULL);
if (!nopre)
EC_KEY_precompute_mult(loopargs[i].sm2[testnum], NULL);
/* Perform SM2 signature test */
EC_KEY_generate_key(loopargs[i].sm2[testnum]);
st = SM2_sign(0, loopargs[i].buf, 32, loopargs[i].buf2,
@@ -3039,7 +3046,8 @@ int speed_main(int argc, char **argv)
rsa_count = 1;
} else {
for (i = 0; i < loopargs_len; i++) {
EC_KEY_precompute_mult(loopargs[i].sm2[testnum], NULL);
if (!nopre)
EC_KEY_precompute_mult(loopargs[i].sm2[testnum], NULL);
/* Perform SM2 encryption test */
EC_KEY_generate_key(loopargs[i].sm2[testnum]);
st = SM2_encrypt(NID_sm3, loopargs[i].buf, 32, loopargs[i].buf2,