Alawn/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2024-02-26 23:08:08 +00:00
Code Issues Releases Wiki Activity
536 Commits 6 Branches 14 Tags
ece7d8741386ef5378dcd91067d32eb2bea045a1
Commit Graph
536 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yiming Jing ece7d87413 Add ECDHE-SM2-WITH-SMS4-GCM-SM3 2018-12-11 18:51:32 -08:00
Zhi Guan 1c00e47681 Update sm9 functions 2018-12-07 16:32:12 +08:00
Zhi Guan 6f5b7a4c96 Merge branch 'master' of https://github.com/guanzhi/GmSSL 2018-12-06 22:12:10 +08:00
Zhi Guan 9b5eaab86a some bug fix 2018-12-06 22:12:05 +08:00
Zhi Guan 5a40547c0b Merge pull request #627 from ZZMarquis/patch-1 
remove unused code
 2018-12-04 22:45:24 +08:00
Zhi Guan f105ad94c4 Merge pull request #628 from cntpro/master 
修正windows下nmake clean 时命令行太长的错误
 2018-12-04 22:41:33 +08:00
Zhi Guan bc2bb8a335 Add accurate asn.1 siganture/ciphertext size 2018-12-04 15:56:21 +08:00
Zhi Guan c0ee87b077 Update SM9 EVP 2018-12-03 17:15:57 +08:00
ZZMarquis d26c35538e remove unused code 
remove unused code
 2018-12-03 15:26:39 +08:00
Zhi Guan c301af807b update demos 2018-11-28 16:47:03 +08:00
Zhi Guan 7ddf846d33 update 2018-11-28 16:46:22 +08:00
Zhi Guan 1fc95d13a7 Update util/libssl.num 2018-11-28 16:15:36 +08:00
Zhi Guan 1bb640b425 Merge branch 'master' of https://github.com/guanzhi/GmSSL 2018-11-28 16:15:09 +08:00
Zhi Guan 5f3bb5c346 update pmeth/ameth 2018-11-28 16:15:06 +08:00
Simon 7f13486dbc Update bug_report.md 2018-11-27 19:42:59 +08:00
Simon 54f538e4ea Update issue templates 2018-11-27 19:35:23 +08:00
Simon 847b2b4b65 Merge pull request #621 from guanzhi/add-code-of-conduct-1 
Create CODE_OF_CONDUCT.md
 2018-11-27 19:32:05 +08:00
Simon b6f015b2fa Create CODE_OF_CONDUCT.md 2018-11-27 19:31:26 +08:00
Simon 76574b6eaf Update LICENSE 2018-11-27 19:17:59 +08:00
Wang Qing a29d5bd436 Add linux64-mips64 build support with mips64r2. 2018-11-27 19:02:46 +08:00
Zhi Guan 9fe7aa1280 Merge pull request #539 from ZZMarquis/patch-2 
[bugfix] EC_KEY_set_ECCrefPublicKey转换过程中未处理字节数组偏移
 2018-11-26 17:05:41 +08:00
Simon d4768d2594 Update gmapi_skf_ec.c 2018-11-24 20:34:02 +08:00
Simon 339c2a0bb2 Update gmapi_skf_ec.c 2018-11-24 20:22:34 +08:00
Feng Jie 38201e1161 Fix unnecessary free in o2i_SM2CiphertextValue 
The caller will crash when using the return value from
o2i_SM2CiphertextValue. Because the returned pointer to SM2CiphertextValue has been free,
regardless of success or failure in this method.

When assign cv to ret, cv should be set NULL just like the behaviour in
SM2_do_encrypt.
 2018-11-24 20:09:02 +08:00
Simon 40b6623427 Update gmapi_skf_ec.c 2018-11-24 20:05:13 +08:00
Jiajun Xin 49987bfa9f remove the line ENGINE_free. In this function, the engine is not newed, so there should not be a free here. This line can cause nil pointer dereference when called. 2018-11-24 19:57:01 +08:00
Zhi Guan e7dc7b2656 Fix sm2 asm build errors on x86 2018-11-21 16:35:50 +08:00
Zhi Guan 322c660970 Update util/mkdef.pl 2018-11-17 19:49:03 +08:00
Zhi Guan 952321677f Merge branch 'master' of https://github.com/guanzhi/GmSSL 2018-11-16 15:26:33 +08:00
Zhi Guan 9a999ae907 Add sm9 and paillier pem support 2018-11-16 15:26:30 +08:00
Zhi Guan 5baad7e043 Fix pailliertest.c bug 2018-11-16 14:17:56 +08:00
Zhi Guan 7657f6f523 Install openssl cli 
Symbol link to `gmssl` binary
 2018-11-16 14:15:42 +08:00
Liu 57f0d827cd 修正windows 编译nmake clean 时命令行太长的错误 
del /Q /F apps\gmssl.exe fuzz\asn1-test.exe fuzz\asn1parse-test.exe fuzz\bignum-test.exe fuzz\bndiv-test.exe fuzz\cms-test.exe fuzz\conf-test.exe fuzz\crl-test.exe fuzz\ct-test.exe fuzz\server-test.exe fuzz\x509-test.exe test\aborttest.exe test\afalgtest.exe test\asynciotest.exe test\asynctest.exe test\bad_dtls_test.exe test\base58test.exe test\bb1ibetest.exe test\bfibetest.exe test\bftest.exe test\bio_enc_test.exe test\bioprinttest.exe test\bntest.exe test\buildtest_aes.exe test\buildtest_asn1.exe test\buildtest_asn1t.exe test\buildtest_async.exe test\buildtest_base58.exe test\buildtest_bb1ibe.exe test\buildtest_bfibe.exe test\buildtest_bio.exe test\buildtest_blowfish.exe test\buildtest_bn.exe test\buildtest_bn_gfp2.exe test\buildtest_bn_hash.exe test\buildtest_bn_solinas.exe test\buildtest_buffer.exe test\buildtest_camellia.exe test\buildtest_cast.exe test\buildtest_cmac.exe test\buildtest_cms.exe test\buildtest_comp.exe test\buildtest_conf.exe test\buildtest_conf_api.exe test\buildtest_cpk.exe test\buildtest_crypto.exe test\buildtest_ct.exe test\buildtest_des.exe test\buildtest_dh.exe test\buildtest_dsa.exe test\buildtest_dtls1.exe test\buildtest_e_os2.exe test\buildtest_ebcdic.exe test\buildtest_ec.exe test\buildtest_ec_hash.exe test\buildtest_ec_type1.exe test\buildtest_ecdh.exe test\buildtest_ecdsa.exe test\buildtest_ecies.exe test\buildtest_engine.exe test\buildtest_err.exe test\buildtest_evp.exe test\buildtest_ffx.exe test\buildtest_fppoint.exe test\buildtest_gmapi.exe test\buildtest_gmsaf.exe test\buildtest_gmsdf.exe test\buildtest_gmskf.exe test\buildtest_gmsof.exe test\buildtest_gmtls.exe test\buildtest_hkdf.exe test\buildtest_hmac.exe test\buildtest_idea.exe test\buildtest_is_gmssl.exe test\buildtest_kdf.exe test\buildtest_kdf2.exe test\buildtest_lhash.exe test\buildtest_md4.exe test\buildtest_md5.exe test\buildtest_mdc2.exe test\buildtest_modes.exe test\buildtest_obj_mac.exe test\buildtest_objects.exe test\buildtest_ocsp.exe test\buildtest_opensslv.exe test\buildtest_ossl_typ.exe test\buildtest_otp.exe test\buildtest_paillier.exe test\buildtest_pem.exe test\buildtest_pem2.exe test\buildtest_pem3.exe test\buildtest_pkcs12.exe test\buildtest_pkcs7.exe test\buildtest_rand.exe test\buildtest_rc2.exe test\buildtest_rc4.exe test\buildtest_ripemd.exe test\buildtest_rsa.exe test\buildtest_saf.exe test\buildtest_safestack.exe test\buildtest_sdf.exe test\buildtest_seed.exe test\buildtest_serpent.exe test\buildtest_sgd.exe test\buildtest_sha.exe test\buildtest_skf.exe test\buildtest_sm1.exe test\buildtest_sm2.exe test\buildtest_sm3.exe test\buildtest_sm9.exe test\buildtest_sms4.exe test\buildtest_sof.exe test\buildtest_speck.exe test\buildtest_srp.exe test\buildtest_srtp.exe test\buildtest_ssf33.exe test\buildtest_ssl.exe test\buildtest_ssl2.exe test\buildtest_stack.exe test\buildtest_symhacks.exe test\buildtest_tls1.exe test\buildtest_ts.exe test\buildtest_txt_db.exe test\buildtest_ui.exe test\buildtest_whrlpool.exe test\buildtest_x509.exe test\buildtest_x509_vfy.exe test\buildtest_x509v3.exe test\buildtest_zuc.exe test\casttest.exe test\cipherlist_test.exe test\clienthellotest.exe test\constant_time_test.exe test\cpktest.exe test\crltest.exe test\ct_test.exe test\d2i_test.exe test\danetest.exe test\destest.exe test\dhtest.exe test\dsatest.exe test\dtlstest.exe test\dtlsv1listentest.exe test\ec2test.exe test\ecdhtest.exe test\ecdsatest.exe test\eciestest.exe test\ectest.exe test\enginetest.exe test\evp_extra_test.exe test\evp_test.exe test\exptest.exe test\ffxtest.exe test\gmapitest.exe test\gmdifftest.exe test\heartbeat_test.exe test\hmactest.exe test\ideatest.exe test\igetest.exe test\kdf2test.exe test\md2test.exe test\md4test.exe test\md5test.exe test\mdc2test.exe test\memleaktest.exe test\otptest.exe test\p5_crpt2_test.exe test\packettest.exe test\pailliertest.exe test\pbelutest.exe test\randtest.exe test\rc2test.exe test\rc4test.exe test\rc5test.exe test\rmdtest.exe test\rsa_test.exe test\saftest.exe test\sanitytest.exe test\sdftest.exe test\secmemtest.exe test\serpenttest.exe test\sha1test.exe test\sha256t.exe test\sha512t.exe test\shlibloadtest.exe test\skftest.exe test\sm2test.exe test\sm3test.exe test\sm9test.exe test\sms4test.exe test\softest.exe test\specktest.exe test\srptest.exe test\ssl_test.exe test\ssl_test_ctx_test.exe test\sslapitest.exe test\sslcorrupttest.exe test\ssltest_old.exe test\threadstest.exe test\v3ext.exe test\v3nametest.exe test\verify_extra_test.exe test\wp_test.exe test\x509aux.exe test\zuctest.exe engines\capi.dll engines\ossltest.dll engines\padlock.dll engines\sdf_dummy.dll engines\skf_dummy.dll apps\CA.pl apps\tsget.pl tools\c_rehash.pl
NMAKE : fatal error U1095: 扩展命令行“del /Q /F apps\gmssl.exe fuzz\asn1-test.exe fuzz\asn1parse-test.exe fuzz\bignum-test.exe fuzz\bndiv-test.exe fuzz\cms-test.exe fuzz\conf-test.exe fuzz\crl-test.exe fuzz\ct-test.exe fuzz\server-test.exe fuzz\x509-test.exe test\aborttest.exe test\afalgtest.exe test\asynciotest.exe test\asynctest.exe test\bad_dtls_test.exe test\base58test.exe test\bb1ibetest.exe test\bfibetest.exe test\bftest.exe test\bio_enc_test.exe test\bioprinttest.exe test\bntest.exe test\buildtest_aes.exe test\buildtest_asn1.exe test\buildtest_asn1t.exe test\buildtest_async.exe test\buildtest_base58.exe test\buildtest_bb1ibe.exe test\buildtest_bfibe.exe test\buildtest_bio.exe test\buildtest_blowfish.exe test\buildtest_bn.exe test\buildtest_bn_gfp2.exe test\buildtest_bn_hash.exe test\buildtest_bn_solinas.exe test\buildtest_buffer.exe test\buildtest_camellia.exe test\buildtest_cast.exe test\buildtest_cmac.exe test\buildtest_cms.exe test\buildtest_comp.exe test\buildtest_conf.exe test\buildtest_conf_api.exe test\buildtest_cpk.exe test\buildtest_crypto.exe test\buildtest_ct.exe test\buildtest_des.exe test\buildtest_dh.exe test\buildtest_dsa.exe test\buildtest_dtls1.exe test\buildtest_e_os2.exe test\buildtest_ebcdic.exe test\buildtest_ec.exe test\buildtest_ec_hash.exe test\buildtest_ec_type1.exe test\buildtest_ecdh.exe test\buildtest_ecdsa.exe test\buildtest_ecies.exe test\buildtest_engine.exe test\buildtest_err.exe test\buildtest_evp.exe test\buildtest_ffx.exe test\buildtest_fppoint.exe test\buildtest_gmapi.exe test\buildtest_gmsaf.exe test\buildtest_gmsdf.exe test\buildtest_gmskf.exe test\buildtest_gmsof.exe test\buildtest_gmtls.exe test\buildtest_hkdf.exe test\buildtest_hmac.exe test\buildtest_idea.exe test\buildtest_is_gmssl.exe test\buildtest_kdf.exe test\buildtest_kdf2.exe test\buildtest_lhash.exe test\buildtest_md4.exe test\buildtest_md5.exe test\buildtest_mdc2.exe test\buildtest_modes.exe test\buildtest_obj_mac.exe test\buildtest_objects.exe test\buildtest_ocsp.exe test\buildtest_opensslv.exe test\buildtest_ossl_typ.exe test\buildtest_otp.exe test\buildtest_paillier.exe test\buildtest_pem.exe test\buildtest_pem2.exe test\buildtest_pem3.exe test\buildtest_pkcs12.exe test\buildtest_pkcs7.exe test\buildtest_rand.exe test\buildtest_rc2.exe test\buildtest_rc4.exe test\buildtest_ripemd.exe test\buildtest_rsa.exe test\buildtest_saf.exe test\buildtest_safestack.exe test\buildtest_sdf.exe test\buildtest_seed.exe test\buildtest_serpent.exe test\buildtest_sgd.exe test\buildtest_sha.exe test\buildtest_skf.exe test\buildtest_sm1.exe test\buildtest_sm2.exe test\buildtest_sm3.exe test\buildtest_sm9.exe test\buildtest_sms4.exe test\buildtest_sof.exe test\buildtest_speck.exe test\buildtest_srp.exe test\buildtest_srtp.exe test\buildtest_ssf33.exe test\buildtest_ssl.exe test\buildtest_ssl2.exe test\buildtest_stack.exe test\buildtest_symhacks.exe test\buildtest_tls1.exe test\buildtest_ts.exe test\buildtest_txt_db.exe test\buildtest_ui.exe test\buildtest_whrlpool.exe test\buildtest_x509.exe test\buildtest_x509_vfy.exe test\buildtest_x509v3.exe test\buildtest_zuc.exe test\casttest.exe test\cipherlist_test.exe test\clienthellotest.exe test\constant_time_test.exe test\cpktest.exe test\crltest.exe test\ct_test.exe test\d2i_test.exe test\danetest.exe test\destest.exe test\dhtest.exe test\dsatest.exe test\dtlstest.exe test\dtlsv1listentest.exe test\ec2test.exe test\ecdhtest.exe test\ecdsatest.exe test\eciestest.exe test\ectest.exe test\enginetest.exe test\evp_extra_test.exe test\evp_test.exe test\exptest.exe test\ffxtest.exe test\gmapitest.exe test\gmdifftest.exe test\heartbeat_test.exe test\hmactest.exe test\ideatest.exe test\igetest.exe test\kdf2test.exe test\md2test.exe test\md4test.exe test\md5test.exe test\mdc2test.exe test\memleaktest.exe test\otptest.exe test\p5_crpt2_test.exe test\packettest.exe test\pailliertest.exe test\pbelutest.exe test\randtest.exe test\rc2test.exe test\rc4test.exe test\rc5test.exe test\rmdtest.exe test\rsa_test.exe test\saftest.exe test\sanitytest.exe test\sdftest.exe test\secmemtest.exe test\serpenttest.exe test\sha1test.exe test\sha256t.exe test\sha512t.exe test\shlibloadtest.exe test\skftest.exe test\sm2test.exe test\sm3test.exe test\sm9test.exe test\sms4test.exe test\softest.exe test\specktest.exe test\srptest.exe test\ssl_test.exe test\ssl_test_ctx_test.exe test\sslapitest.exe test\sslcorrupttest.exe test\ssltest_old.exe test\threadstest.exe test\v3ext.exe test\v3nametest.exe test\verify_extra_test.exe test\wp_test.exe test\x509aux.exe test\zuctest.exe engines\capi.dll engines\ossltest.dll engines\padlock.dll engines\sdf_dummy.dll engines\skf_dummy.dll apps\CA.pl apps\tsget.pl tools\c_rehash.pl”太长
Stop.
 2018-11-13 14:49:08 +08:00
Zhi Guan f859e4b7fa Merge pull request #571 from xianrenqiu/master 
sm2: fix cv free error, in o2i_SM2CiphertextValue() function
 2018-11-13 13:54:28 +08:00
Zhi Guan c9ec102cbd Merge pull request #574 from zzclzxc/master 
fix sm3 padding bug
 2018-11-13 13:54:09 +08:00
Zhi Guan babb4447a5 Fix skf_dummy and sdf_dummy config error 2018-11-13 11:42:02 +08:00
Zhi Guan 3fb9b94d51 Set hmac-sm3 as default prf of sms4 in PKCS#5 2018-11-02 11:21:41 +08:00
Zhi Guan d58931925b Update some demos 2018-11-01 11:21:14 +08:00
Zhi Guan 676076278d Update some demos 2018-10-31 11:03:21 +08:00
Zhi Guan 9eadfd4cb6 Update CPK sub-lib 
Use simple NID as arguments, and fix some bugs
 2018-10-21 19:43:40 +08:00
Zhi Guan ce1763c9ea Fix .gitignore 2018-10-20 14:40:21 +08:00
Zhi Guan 5ff8ef6136 Add some demo scripts 2018-10-20 11:41:48 +08:00
Zhi Guan 6fe883cd3a Add is_gmssl.h 
Add code `#include <openssl/is_gmssl.h>` to check if GmSSL library is linked instead of the system pre-installed OpenSSL library.
 2018-10-20 11:05:29 +08:00
Zhi Guan d81a43b6d5 Merge pull request #589 from bruce-sunshine/bruce_sdt 
delete OPENSSL_assert in ECDSA_SIG_set_ECCSIGNATUREBLOB
 2018-10-19 16:05:40 +08:00
Zhi Guan 89c826054b Update cpk 
fix bug and add demo code
 2018-10-19 00:09:54 +08:00
bruce 3d8fbc8bfd delete OPENSSL_assert in ECDSA_SIG_set_ECCSIGNATUREBLOB 2018-10-15 10:39:08 +08:00
Zhi Guan f411936f9f Update version to 2.4.0 
Since this version SM9 is offically supported.
 2018-10-13 21:47:14 +08:00
Zhi Guan 5293d0f38d Update SM9 key agreement 2018-10-12 12:07:58 +08:00
Zhi Guan 989bc7638d First SM9 release 
SM9 setup/keygen/sign/verify has been tested. See example codes `demos/sm9/`.
 2018-10-10 20:42:07 +08:00
Zhi Guan 9ca519edfa Update SM9 decrypt 
to be tested
 2018-10-06 17:33:34 +08:00