Commit Graph
176 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 15c7a734f4 Merge branch 'master' of https://github.com/zhaoxiaomeng/GmSSL 2017-04-14 15:45:10 +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
Simon a9aaa03a81 Update .travis.yml 2017-04-14 15:02:43 +08:00
Simon 9dba3c77e9 Update .travis.yml 2017-04-14 14:35:55 +08:00
Simon d435ca35dd Update .travis.yml 2017-04-14 14:26:33 +08:00
Simon c1ce48f18d Update .travis.yml 2017-04-14 14:22:58 +08:00
Simon db12e1177b Update .travis.yml 2017-04-14 14:20:33 +08:00
Simon 48ecb8bfde Update .travis.yml 2017-04-14 13:47:13 +08:00
Simon 6a6cd1d311 Update .travis.yml 2017-04-14 13:41:09 +08:00
Simon 6eb382f34b Update .travis.yml 2017-04-14 13:28:10 +08:00
Simon 2810c1a275 Update .travis.yml 2017-04-14 13:20:30 +08:00
Simon 7ac41a5ca6 Update .travis.yml 2017-04-14 13:16:47 +08:00
Simon 9f6a22124b Update .travis.yml 2017-04-14 13:13:46 +08:00
Simon e9bc53907f Update .travis.yml 2017-04-14 13:10:54 +08:00
Simon fbce8954bc Update .travis.yml 2017-04-14 12:21:13 +08:00
Simon 21b36924d3 Update .travis.yml 2017-04-14 12:17:39 +08:00
Simon e3baeb92b0 Update .travis.yml 2017-04-14 12:15:29 +08:00
Simon 7d84689e78 Update .travis.yml 2017-04-14 12:09:20 +08:00
Simon d8cdb08fe9 add tri 2017-04-14 11:54:47 +08:00
Simon 685719ab17 Merge pull request #1 from guanzhi/master
1
2017-04-14 11:52:07 +08:00
hx 7fa961cd6f Update README.md
pkeyutl verify should use -pubin
2017-04-14 11:03:14 +08:00
Simon 3f2ac64531 Add license file to root
The GmSSL toolkit stays under a double license, i.e. both the conditions of
  the GmSSL License and the original OpenSSL license apply to the toolkit.
  See below for the actual license texts.
2017-04-14 10:44:00 +08:00
Simon b42d5a0abd Revert "Create myserpent.c"
This reverts commit 5a8ea632b4.
2017-04-13 13:07:35 +08:00
Simon 24e63b0650 Revert "Create myserpent.h"
This reverts commit ff8b389b88.
2017-04-13 13:07:35 +08:00
Simon 4363f18908 Revert "Create test.cff"
This reverts commit 58333e1afc.
2017-04-13 13:07:35 +08:00
Simon 96deebe60b Revert "Rename test.cff to test.c"
This reverts commit ae4797ec83.
2017-04-13 13:07:35 +08:00
Simon 0ab4b44884 Revert "Update myserpent.c"
This reverts commit 725588764e.
2017-04-13 13:07:35 +08:00
Simon e014549e6a Revert "Update myserpent.c"
This reverts commit 41411e2f9b.
2017-04-13 13:07:35 +08:00
Simon 47d687de92 Revert "Update myserpent.h"
This reverts commit 3476cfd33e.
2017-04-13 13:07:35 +08:00
Simon 99e3b67092 Revert "Update test.c"
This reverts commit 61bcd5abc4.
2017-04-13 13:07:35 +08:00
GGSuchao 61bcd5abc4 Update test.c 2017-04-11 16:11:44 +08:00
GGSuchao 3476cfd33e Update myserpent.h
change the interface
2017-04-11 16:11:44 +08:00
GGSuchao 41411e2f9b Update myserpent.c
Change the interface
2017-04-11 16:11:44 +08:00
GGSuchao 725588764e Update myserpent.c 2017-04-11 16:11:44 +08:00
GGSuchao ae4797ec83 Rename test.cff to test.c 2017-04-11 16:11:44 +08:00
GGSuchao 58333e1afc Create test.cff 2017-04-11 16:11:44 +08:00
GGSuchao ff8b389b88 Create myserpent.h 2017-04-11 16:11:44 +08:00
GGSuchao 5a8ea632b4 Create myserpent.c 2017-04-11 16:11:44 +08:00
Zhi Guan 64cedcdf29 update speck module 2017-03-26 15:23:37 +08:00
Zhi Guan 019924627e update serpent module 2017-03-26 15:04:30 +08:00
Zhi Guan 0985cf27f1 update Configure 2017-03-26 14:35:55 +08:00
Zhi Guan 72497f1305 update config 2017-03-23 20:50:15 +08:00
laiwei360735 775e3dc3f0 Create speck.h
a not good speck.h
2017-03-23 13:59:26 +08:00
laiwei360735 2855074a54 Create speck.c
a not good speck.c
2017-03-23 13:59:26 +08:00
laiwei360735 73002a1b05 Create specktest.c
a not good specktest
2017-03-23 13:52:39 +08:00
GGSuchao 6637b19499 Update myserpent.c 2017-03-23 13:51:59 +08:00
GGSuchao 723b61ae1a Rename test.cff to test.c 2017-03-23 13:51:59 +08:00