 Timmoc
|
753e20382a
|
Merge branch 'sender_okToCheck' into test_merge
# Conflicts:
# sender/sender.py
|
3 months ago |
|
Timmoc
|
104a523445
|
Merge branch 'recyvan_2' into test_merge
|
3 months ago |
 UniDarkstars
|
2ebfc948dd
|
获得接收方公钥getRecvPubKey
|
3 months ago |
|
Timmoc
|
2bbb0962a1
|
往appdata灌石，公私钥对现存储于appdata目录下
|
3 months ago |
 recyvan
|
dc73c10e43
|
修复了一下不知名bug
|
3 months ago |
|
recyvan
|
e6c7588e2f
|
Merge remote-tracking branch 'origin/recyvan_2' into recyvan_2
|
3 months ago |
|
recyvan
|
50ccd97d6c
|
支持ip地址格式，局域网访问
|
3 months ago |
|
UniDarkstars
|
d0d152272e
|
AES只留下CBC和ECB模式，删除了一些冗余代码
|
3 months ago |
|
Timmoc
|
5d6226290d
|
禁止dangerous
|
3 months ago |
|
recyvan
|
8227015134
|
Merge remote-tracking branch 'origin/recv_timmoc' into recyvan_2
|
3 months ago |
|
Timmoc
|
a14aa4bf31
|
使用readme进行测试
|
3 months ago |
|
recyvan
|
3c34ce49a9
|
Merge remote-tracking branch 'origin/sender_okToCheck' into recyvan_2
# Conflicts:
# recv/recv.py
|
3 months ago |
|
Timmoc
|
9bd045678e
|
适配windows环境变量
|
3 months ago |
|
recyvan
|
b2a6196dbb
|
更新一下
|
3 months ago |
|
Timmoc
|
632981180a
|
Merge branch 'sender_okToCheck' into recv_timmoc
# Conflicts:
# recv/recv.py
|
3 months ago |
|
Timmoc
|
885d288719
|
增加pytest.ini
|
3 months ago |
|
Timmoc
|
8ee4a2e136
|
修正base64问题
|
3 months ago |
|
UniDarkstars
|
a7e3cb67e8
|
更改了recv和AES，AES使用信封内的密钥进行解密
|
3 months ago |
|
recyvan
|
a67a749bb3
|
Merge remote-tracking branch 'origin/recv_timmoc' into recyvan_2
|
3 months ago |
|
UniDarkstars
|
ca27e6d24f
|
小改，无伤大雅
|
3 months ago |
|
Timmoc
|
9a53fb2e12
|
python3.12惊喜双引号内双引号不报错
|
3 months ago |
|
Timmoc
|
80a971702e
|
aes base64 decode
|
3 months ago |
|
recyvan
|
27766625bd
|
Merge remote-tracking branch 'origin/sender_okToCheck' into recyvan_2
|
3 months ago |
|
Timmoc
|
b60d827192
|
提交一下未能通过测试的测试用例
|
3 months ago |
|
Timmoc
|
e1f32293e9
|
Merge branch 'sender_okToCheck' into recv_timmoc
|
3 months ago |
|
UniDarkstars
|
20f2c46dfa
|
更新了一下sender.py的main()，没做太大改动，只是符合了一下测试用例
|
3 months ago |
|
Timmoc
|
b07196c651
|
Merge remote-tracking branch 'origin/recv_timmoc' into recv_timmoc
# Conflicts:
# recv/recv.py
|
3 months ago |
|
Timmoc
|
b37acaaf22
|
文件现在不会覆盖现有的文件了
|
3 months ago |
|
Timmoc
|
637fe0b0c8
|
文件现在不会覆盖现有的文件了
|
3 months ago |
|
Timmoc
|
a2162b4a3e
|
文件现在默认保存到download文件夹
增加发送方提醒，使用Segwit地址
|
3 months ago |
|
UniDarkstars
|
e939dd5cbc
|
增加了main文件里的greet，好玩爱玩
|
3 months ago |
|
UniDarkstars
|
2d8ec4af3d
|
英文改中文，增加了文件选择的错误异常抛出
|
3 months ago |
|
recyvan
|
8da58c145a
|
网络传输改为线程模式，这样就可同时接收和发送数据，没有先后顺序
|
3 months ago |
|
UniDarkstars
|
4dd67a326e
|
英文改中文，增加了文件选择的错误异常抛出
|
3 months ago |
|
UniDarkstars
|
aef23d2af7
|
sender.py 增加了获取文件名
|
3 months ago |
|
Timmoc
|
2689090700
|
有屎啊
修了一点okToCheck的代码，反正现在test_recv跑通了，剩下的都是小事了。
准备把这坨大的合并到main分支
|
4 months ago |
|
UniDarkstars
|
713105b87c
|
修改了sender的数据格式
|
4 months ago |
|
Timmoc
|
4f0f01a1d1
|
sender 修正
准备对接Letter
|
4 months ago |
|
UniDarkstars
|
938ba78c03
|
Merge remote-tracking branch 'origin/sender_okToCheck' into sender_okToCheck
|
4 months ago |
|
UniDarkstars
|
49fb76fe56
|
sender修改了逻辑，RSA修改了encrypt_message中cipher_rsa.encrypt(message)，原本message.encode('utf-8')
|
4 months ago |
|
Timmoc
|
b9925d8b88
|
Merge branch 'recv_timmoc' into sender_okToCheck
# Conflicts:
# entity/Letter.py
|
4 months ago |
|
Timmoc
|
0c0bce2095
|
SM4的message使用str，key使用bytes类型
RSA则全程使用bytes类型
|
4 months ago |
|
Timmoc
|
730fb4dd96
|
SM4的message使用str，key使用bytes类型
|
4 months ago |
|
Timmoc
|
c7588a9831
|
修复SM4和RSA的bug
|
4 months ago |
|
UniDarkstars
|
b3a21d30cd
|
sender修改了加密，并且进行了优化了输出格式和代码，letter就改了一下格式，AES完成
|
4 months ago |
|
Timmoc
|
685bccaa93
|
修复部分bug，常规推送
|
4 months ago |
|
UniDarkstars
|
c349bc3039
|
修改了一下，佬来帮我运行一下
|
4 months ago |
|
UniDarkstars
|
8e2b103830
|
Merge remote-tracking branch 'origin/recv_timmoc' into sender_okToCheck
|
4 months ago |
|
UniDarkstars
|
ceb244792b
|
aes文件，sender加密方法和模式选择
|
4 months ago |
|
Timmoc
|
658c939613
|
完成RSA、完成SM4、基本完成接收者代码
|
4 months ago |
