From 713105b87c73b6cb22bfe09280683d35acdeebe1 Mon Sep 17 00:00:00 2001
From: UniDarkstars <1830018670@qq.com>
Date: Sun, 24 Nov 2024 20:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86sender=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sender/sender.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sender/sender.py b/sender/sender.py
index ca50838..d30a1b2 100644
--- a/sender/sender.py
+++ b/sender/sender.py
@@ -1,5 +1,6 @@
 # 模式，文件，自己的公钥从哪里来，别人的公钥从哪里来
 from entity.Letter import Letter
+from itsdangerous import base64_encode
 from tool import PriKeyHelper
 from tool.PriKeyHelper import getUserKey
 from tool.asymmetric import RSA
@@ -25,10 +26,9 @@ def main():
     letter.encryptKey = getEncryptKey()
     letter.recvPubKey = getRecvPubKey()
     letter.senderPubKey = getSenderPubKey()
-    SymEncryption(data,letterSymKey)
+    data, akey = SymEncryption(base64_encode(data).decode("utf-8"),letterSymKey)
     # data = "Hello, AES!"
 
-    data, akey = SymEncryption(data)
     letter.sign = getSign()
 
 
@@ -39,6 +39,7 @@ def main():
     print(letter.recvPubKey)
     print(letter.senderPubKey)
 
+
     # 获取用户的公私钥对进行签名
     # 使用对方的公钥进行加密
     # 发送信件
@@ -133,7 +134,7 @@ def getEncryptType():
 def getEncryptKey():
     rsaEncrySymKey = RSA.encrypt_message(letterSymKey, getRecvPubKey())
 
-    return rsaEncrySymKey
+    return base64_encode(rsaEncrySymKey).decode("utf-8")
 
 # 获得接收方的公钥
 def getRecvPubKey():