Commit Graph

559 Commits

Author SHA1 Message Date
Zhi Guan
786d6f0205 Add sm2utl and sm9utl commands 2018-12-25 14:49:12 +08:00
Zhi Guan
0e38e3e7a3 Update opt and fpe command 2018-12-20 23:12:33 +08:00
Zhi Guan
16933a7299 Delete mac.go 2018-12-19 22:41:13 +08:00
Zhi Guan
6668f63aaf Merge pull request #647 from Gorachya/sm9_work
fast-final-expo
2018-12-19 17:07:04 +08:00
Soraba Shrine de Gorachya
907d5e92d0 fast-final-expo 2018-12-19 00:17:30 -08:00
Zhi Guan
62d385ab71 Bug fix 2018-12-19 12:21:42 +08:00
Zhi Guan
3e3cc9d4a7 Update ec lib 2018-12-19 12:09:23 +08:00
Zhi Guan
d4917f27bd Add sm2 command 2018-12-19 11:51:20 +08:00
Zhi Guan
4ca17c807c Update .num files 2018-12-19 11:34:32 +08:00
Zhi Guan
74a729aa77 Add sm2 and otp command
try `gmssl sm2 -help` and `gmssl otp -help`
2018-12-19 10:01:38 +08:00
赵晓濛
5bc22a1f3e Update appveyor.yml
Update with install test
2018-12-18 23:04:15 +08:00
Simon
d4989fd7a7 Merge pull request #639 from cntpro/master
增加java api windows编译的winmake
2018-12-18 20:58:13 +08:00
Simon
373e9788ed Update README.md 2018-12-18 20:35:36 +08:00
Simon
3d916e9bce Update README.md 2018-12-18 20:34:06 +08:00
Simon
e0a9795f0f Update README.md 2018-12-18 20:30:16 +08:00
Simon
2c13048935 Update appveyor.yml 2018-12-18 20:10:11 +08:00
Simon
f67e0424e2 Update appveyor.yml 2018-12-18 20:07:06 +08:00
Simon
190323598a Update appveyor.yml 2018-12-18 19:58:18 +08:00
Simon
7b02102ce2 Update appveyor.yml 2018-12-17 22:02:31 +08:00
Simon
6095a6aa16 Update README.md 2018-12-17 21:52:56 +08:00
Liu
c41e99b3b5 Merge pull request #1 from guanzhi/master
合并主程序
2018-12-13 11:34:07 +08:00
Liu
04cc7afa8d 增加java api windows编译的winmake
增加java api windows编译的winmake  
nmake -f winmake  或者
nmake -f winmake   STATIC=1
2018-12-12 12:56:51 +08:00
Zhi Guan
4a8f432f71 Merge pull request #638 from mesalock-linux/bincat-tls_sms4_gcm
Add ECDHE-SM2-WITH-SMS4-GCM-SM3
2018-12-12 11:26:27 +08:00
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