301 Commits

Author SHA1 Message Date
38a15f79ed fix: fix some bugs 2023-10-18 20:51:57 +08:00
d1856f053b Merge pull request 'main' (#14) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#14
2023-10-18 17:35:17 +08:00
dqy
77c61db035 Merge pull request 'feat: update demo' (#12) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#12
2023-10-18 17:28:29 +08:00
854bb17cac feat: update demo 2023-10-18 17:27:52 +08:00
dqy
3caef433f8 Merge pull request 'main' (#11) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#11
2023-10-18 17:18:01 +08:00
6c1fefd9d3 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-18 17:13:20 +08:00
db6c6bef23 perf: remove i, j 2023-10-18 17:11:31 +08:00
dqy
c8975a104b refactor: refactor: 添加f函数注释;f、Encapsulate增加模P 2023-10-18 16:59:22 +08:00
dqy
e4ce861ec7 refactor: 添加f函数注释;f、Encapsulate增加模P 2023-10-18 16:49:40 +08:00
b6e4106ae1 Merge pull request 'main' (#13) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#13
2023-10-18 16:08:03 +08:00
a196530fde perf: rewrite DecapsulateFrags 2023-10-18 16:02:21 +08:00
a68fcf1eec style: replace chinese comma 2023-10-18 15:28:31 +08:00
02fbfbbd70 style: use black to modify style 2023-10-18 15:26:52 +08:00
1958f95c24 feat: add debug trace 2023-10-18 15:22:00 +08:00
21cf4a1239 Merge pull request 'main' (#12) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#12
2023-10-18 11:04:50 +08:00
c7a942634e fix: fix bugs 2023-10-18 11:00:32 +08:00
2d7e52f512 Merge pull request 'main' (#8) from ccyj/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#8
2023-10-18 10:21:00 +08:00
c2698455de fix: 修改了merge 和Decryptfrags 函数 2023-10-18 10:16:49 +08:00
a10144f05d Merge pull request 'main' (#11) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#11
2023-10-17 23:18:52 +08:00
c0494494a7 feat: finish demo 2023-10-17 23:00:28 +08:00
9e8760e5d9 feat: add point type and capsule type 2023-10-17 22:40:17 +08:00
ccb4287671 Merge pull request 'main' (#10) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#10
2023-10-17 22:06:48 +08:00
f9e22fa39c feat: start trace demo 2023-10-17 22:06:04 +08:00
5278a1fc64 fix: remove pk sk 2023-10-17 22:04:49 +08:00
dff57fc3c6 fix: fix name error 2023-10-17 21:54:52 +08:00
df16e661f2 fix: rename hash 2023-10-17 21:51:04 +08:00
523bae52a9 Merge pull request 'main' (#9) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#9
2023-10-17 21:50:29 +08:00
3467118d6c fix: remove setup function 2023-10-17 21:40:15 +08:00
1de0e1c4f9 Merge pull request 'main' (#5) from dqy/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#5
2023-10-17 21:10:14 +08:00
dqy
aeca5c6772 perf: 删除demo.py 2023-10-17 21:06:31 +08:00
dqy
c2eba8a0bf perf: 注释掉Setup函数并将G, g, U转化为全局变量;添加demo.py 2023-10-17 21:02:55 +08:00
dqy
1f83cb2140 Merge pull request 'main' (#10) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#10
2023-10-17 00:25:08 +08:00
2dc927617d Merge pull request 'fix: 修改了参数X_A,因为值是固定的,直接读取list中的值' (#4) from ccyj/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#4
2023-10-16 22:33:02 +08:00
c972af0371 fix: 修改了参数X_A,因为值是固定的,直接读取list中的值 2023-10-16 22:31:31 +08:00
cd1e884713 fix: extract hash and kdf from setup 2023-10-16 22:30:15 +08:00
96e04c155e Merge pull request 'main' (#3) from ccyj/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#3
2023-10-16 22:08:43 +08:00
56f8945b46 fix: mergeccfrag 函数添加参数N:int,t:int ; DecapsulateFrags函数修改变量名字,λ->b 2023-10-16 14:51:34 +08:00
e29aab0214 Merge pull request 'feat: merge form jiangchao' (#8) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#8
2023-10-16 12:19:37 +08:00
9c35cf1519 feat: merge form jiangchao 2023-10-16 10:58:47 +08:00
b680b4aebb Merge pull request 'main' (#7) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#7
2023-10-15 15:25:13 +08:00
fd07fd9310 Merge branch 'dqy-main' 2023-10-15 14:24:12 +08:00
98685e6f44 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai into dqy-main 2023-10-15 14:20:29 +08:00
00425394c4 style: update readme style 2023-10-15 14:04:17 +08:00
6087762655 feat: update gitignore 2023-10-15 14:02:26 +08:00
d5527c0c8d doc: update readme 2023-10-15 14:01:31 +08:00
19298152c5 feat: temp docker file 2023-10-15 14:01:12 +08:00
b1fd853270 feat: add KDF function 2023-10-15 14:00:55 +08:00
dqy
9a767a3fa4 feat: 添加封装算法Encapsulate,修改Setup函数中的KDF函数,添加全局变量:安全参数sec, A和B的公钥和私钥,G, g, U, hash2, hash3, hash4, KDF 2023-10-14 21:59:50 +08:00
dqy
ba5289a33a feat: add GenerateRekey 2023-10-14 21:23:44 +08:00
dqy
1aaa3ee756 Merge pull request 'main' (#6) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#6
2023-10-14 20:01:24 +08:00