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

Merge branch 'master' of https://github.com/guanzhi/GmSSL

Browse Source
This commit is contained in:
Zhi Guan
2018-12-06 22:12:10 +08:00
parent 9b5eaab86a 5a40547c0b
commit 6f5b7a4c96
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Configurations/windows-makefile.tmpl
View File

@@ -66,7 +66,7 @@ SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; shlib($_) } @{$unified_in
ENGINES={- join(" ", map { dso($_) } @{$unified_info{engines}}) -} ENGINES={- join(" ", map { dso($_) } @{$unified_info{engines}}) -}
ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; dso($_) } @{$unified_info{engines}}) -} ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; dso($_) } @{$unified_info{engines}}) -}
## FIXME: PROGRAMS might be too long, seperate it into 2 strings ## FIXME: PROGRAMS might be too long, seperate it into 2 strings
PROGRAMS={- join(" ", map { $_.$exeext } @{$unified_info{programs}}) -} PROGRAMS={- our @PROGRAMS = map { $_.$exeext } @{$unified_info{programs}}; join(" ", @PROGRAMS) -}
PROGRAMPDBS={- join(" ", map { $_.".pdb" } @{$unified_info{programs}}) -} PROGRAMPDBS={- join(" ", map { $_.".pdb" } @{$unified_info{programs}}) -}
SCRIPTS={- join(" ", @{$unified_info{scripts}}) -} SCRIPTS={- join(" ", @{$unified_info{scripts}}) -}
{- output_off() if $disabled{makedepend}; "" -} {- output_off() if $disabled{makedepend}; "" -}
@@ -225,7 +225,8 @@ libclean:
-del /Q ossl_static.pdb -del /Q ossl_static.pdb
clean: libclean clean: libclean
-del /Q /F $(PROGRAMS) $(ENGINES) $(SCRIPTS) {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS); -}
-del /Q /F $(ENGINES) $(SCRIPTS)
-del /Q /F $(GENERATED) -del /Q /F $(GENERATED)
-del /Q /S /F *.d -del /Q /S /F *.d
-del /Q /S /F *.obj -del /Q /S /F *.obj

8
crypto/gmapi/gmapi_sdf_ec.c
View File

@@ -305,7 +305,6 @@ SM2CiphertextValue *SM2CiphertextValue_new_from_ECCCipher(const ECCCipher *ref)
{ {
SM2CiphertextValue *ret = NULL; SM2CiphertextValue *ret = NULL;
SM2CiphertextValue *cv = NULL; SM2CiphertextValue *cv = NULL;
EC_GROUP *group = NULL;
/* check arguments */ /* check arguments */
if (!ref) { if (!ref) {
@@ -320,12 +319,6 @@ SM2CiphertextValue *SM2CiphertextValue_new_from_ECCCipher(const ECCCipher *ref)
} }
/* ECCCipher => SM2CiphertextValue */ /* ECCCipher => SM2CiphertextValue */
if (!(group = EC_GROUP_new_by_curve_name(NID_sm2p256v1))) {
GMAPIerr(GMAPI_F_SM2CIPHERTEXTVALUE_NEW_FROM_ECCCIPHER,
ERR_R_EC_LIB);
goto end;
}
if (!(cv = SM2CiphertextValue_new())) { if (!(cv = SM2CiphertextValue_new())) {
GMAPIerr(GMAPI_F_SM2CIPHERTEXTVALUE_NEW_FROM_ECCCIPHER, GMAPIerr(GMAPI_F_SM2CIPHERTEXTVALUE_NEW_FROM_ECCCIPHER,
GMAPI_R_MALLOC_FAILED); GMAPI_R_MALLOC_FAILED);
@@ -342,7 +335,6 @@ SM2CiphertextValue *SM2CiphertextValue_new_from_ECCCipher(const ECCCipher *ref)
cv = NULL; cv = NULL;
end: end:
EC_GROUP_free(group);
SM2CiphertextValue_free(cv); SM2CiphertextValue_free(cv);
return ret; return ret;
} }