Commit Graph

45 Commits

Author SHA1 Message Date
Zhi Guan
5a000d0998 remove warnings 2020-06-19 15:56:33 +08:00
Zhi Guan
8e4e4ea7f2 Merge pull request #761 from yuanzh78/patch-2
Update s3_lib.c ssl_get_algorithm2()
2019-09-03 18:45:16 +08:00
Zhi Guan
f861b98733 Merge pull request #760 from yuanzh78/patch-1
Update t1_lib.c
2019-09-03 18:31:32 +08:00
Zhi Guan
b42251945e version 2.5.3
new sms4 api, go api and ciphersuites
2019-08-13 15:07:53 +08:00
Zhi Guan
fa68930083 Add SM4/SM3 PSK ciphersuite 2019-07-18 16:02:54 +08:00
yuanzh78
b101236292 Update s3_lib.c
in the end of finish msg of gmssl handshake, to get the correct hash algo, otherwise verify failed
2019-05-05 09:30:15 +08:00
yuanzh78
857a599eea Update t1_lib.c
if not process the ext block in the end of server hello data, jump over it.
2019-05-05 09:20:06 +08:00
Zhi Guan
343fa622ae Remove chinese comments 2019-01-14 18:52:54 +08:00
Yiming Jing
ece7d87413 Add ECDHE-SM2-WITH-SMS4-GCM-SM3 2018-12-11 18:51:32 -08:00
Zhi Guan
9b5eaab86a some bug fix 2018-12-06 22:12:05 +08:00
Zhi Guan
9ca519edfa Update SM9 decrypt
to be tested
2018-10-06 17:33:34 +08:00
Zhi Guan
b54a3d35e6 Update SM9 schemes
Update SM9 schemes based on the default sm9bn256v1 r-ate pairing. To be continued.
2018-09-28 22:21:44 +08:00
Zhi Guan
92971350c4 Add GMTLS v1.1 protocol support
Aka GM/T 0024-2012 SSL VPN protocol
2018-03-22 13:09:02 +08:00
Zhi Guan
056130c053 fix ssl bugs 2018-03-13 12:44:00 +08:00
Zhi Guan
4b825edf3c Add some debug info 2018-03-13 12:26:17 +08:00
Zhi Guan
755814db52 Fix SM2 certificate verification
Set the default ec_scheme to secg_scheme, add sm3 ZID to X.509
verification.
2018-01-11 23:37:28 +08:00
Simon
38395c5c80 Revert "quantum init"
This reverts commit 53af3b51ae.
2018-01-04 14:03:38 +08:00
zhaoxiaomeng
53af3b51ae quantum init 2018-01-04 13:40:59 +08:00
Zhi Guan
86aa61c0b6 minor changes 2017-12-26 22:59:32 +08:00
Zhi Guan
a9b31e17a5 wrap optional headers with OPENSSL_NO_ macro 2017-12-26 22:51:47 +08:00
Zhi Guan
2c2739c9e2 bug fix 2017-12-08 21:29:23 +08:00
Zhi Guan
46ee9a4559 add license 2017-12-08 10:46:58 +08:00
Zhi Guan
f5a3f271a3 v2 pre-release 2017-12-07 23:58:48 +08:00
Zhi Guan
a4e6eea2fa tls12 with sm2 cert 2017-12-01 20:28:39 +08:00
Zhi Guan
f53c6b1cfd update ssl 2017-11-30 00:04:10 +08:00
Zhi Guan
7be7ce60dc update ssl 2017-11-29 20:01:07 +08:00
Zhi Guan
2458fcb879 speed sm2/3/4
`gmssl speed sm2 sm3 sms4`
2017-11-25 13:22:04 +08:00
Zhi Guan
4d60905e04 add sm3/sms4 to speed 2017-11-13 15:38:49 +08:00
Zhi Guan
27bde477a5 first step of v2 final release 2017-11-05 21:00:36 +08:00
Zhi Guan
eb21e9d572 update 2017-04-14 15:31:38 +08:00
Zhi Guan
43fed1108d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2017-02-14 16:13:11 +08:00
zs
95c0dba728 补充(漏)提交说明见5c315bca3f 2016-08-22 17:57:42 +08:00
zs
5c315bca3f 1、解决TLS1.x的ECDH-SM2-SM3-SM4/SM2-SM3-SM4两种套件无法握手成功
2、暂去掉非SM算法的套件。
2016-08-22 17:44:54 +08:00
Zhi Guan
09f054b2f2 Support VC-WIN32 2016-07-04 13:03:03 +02:00
Zhi Guan
2cb43b7f80 jni api 2016-06-06 22:04:44 +02:00
Zhi Guan
ee4384daeb SKF Wrapper 2016-05-29 00:22:33 +02:00
Zhi Guan
0cf9126a7d more sm. tests 2016-05-22 20:42:38 +02:00
Zhi Guan
60d14da0cc add CBC-MAC and GM OTP, not tested 2016-05-15 20:21:51 +02:00
Zhi Guan
da6bb109b4 SM4/CTR 2016-04-18 13:41:56 +02:00
Zhi Guan
37ac6cd45a add SM2 default ID, fixed the SM2_do_encrypt() memory leak 2016-04-10 01:42:54 +02:00
Zhi Guan
70118dbcae start SKF engine 2016-04-10 00:01:46 +02:00
Zhi Guan
2563a4ed83 sm2, ssl and license update 2015-10-25 21:20:50 +08:00
Zhi Guan
3bdc0ea895 update 2015-08-15 15:02:15 +08:00
Zhi Guan
db4d3aef00 SM3/SMS4/SM3Sign(modified ECDSA) Supported 2015-08-14 01:08:27 +08:00
Zhi Guan
57954c4567 first commit, SM2-DSA only 2014-12-01 10:40:26 +08:00