Commit Graph
10 Commits
Author SHA1 Message Date
zhaoxiaomeng 883e83be42 Revert "Merge branch 'master' into master"
This reverts commit 0f5b6deb5e, reversing
changes made to eb21e9d572.
2017-04-14 17:25:02 +08:00
Simon 0f5b6deb5e Merge branch 'master' into master 2017-04-14 16:57:24 +08:00
zhaoxiaomeng 77e9ddea57 更新libcrypto.num 2017-04-14 15:43:35 +08:00
Zhi Guan eb21e9d572 update 2017-04-14 15:31:38 +08:00
Zhi Guan edc4e35bf3 remove compiler errors
still some warnings and undef code pieces
2017-03-10 21:18:21 +08:00
Zhi Guan 002096751c update crypto 2017-03-08 15:02:42 +08:00
Zhi Guan 9d485003bd add kdf extra module 2017-02-14 23:49:01 +08:00
Zhi Guan 01c76aa6a0 add sms4 module 2017-02-14 23:14:06 +08:00
Zhi Guan 4e49434209 add sm3 module 2017-02-14 17:16:13 +08:00
Zhi Guan 43fed1108d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2017-02-14 16:13:11 +08:00