From aef23d2af72bca32d56af16181a4b412ab45852d Mon Sep 17 00:00:00 2001
From: UniDarkstars <1830018670@qq.com>
Date: Mon, 25 Nov 2024 11:50:30 +0800
Subject: [PATCH] =?UTF-8?q?sender.py=20=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sender/sender.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sender/sender.py b/sender/sender.py
index 27127fc..0999ec4 100644
--- a/sender/sender.py
+++ b/sender/sender.py
@@ -1,5 +1,7 @@
 # 模式，文件，自己的公钥从哪里来，别人的公钥从哪里来
 import base64
+import os
+from Tools.scripts.abitype import get_fields
 
 from entity.Letter import Letter
 from itsdangerous import base64_encode
@@ -11,7 +13,7 @@ from tool.symmetric.SM4 import encrypt_ecb, decrypt_cbc_with_iv, encrypt_cbc_wit
 from Crypto.Random import get_random_bytes
 
 
-# 两个变量，记录信封
+# 三个全局变量，记录信封
 letterWay = ""
 letterMode = ""
 letterSymKey = b""
@@ -23,7 +25,7 @@ def main():
 
     with open(path,"rb") as f:
         data = f.read()
-    letter.fileName = "交给你了"
+    letter.fileName = getFileName(path)
     letter.recvPubKey = getRecvPubKey()
     letter.senderPubKey = getSenderPubKey()
     letter.fileBase64, akey = SymEncryption(base64_encode(data).decode("utf-8"),letterSymKey)
@@ -33,6 +35,7 @@ def main():
 
     letter.sign = getSign(data)
 
+    print(letter.fileName)
 
 
     print(letter.sign)
@@ -49,8 +52,14 @@ def main():
     pass
 def selectFile() -> str:
     s = input("输入文件路径:")
+    # s = "public.pem"
     return s
 
+# 获得文件名
+def getFileName(fName:str) -> str:
+    filePath = os.path.split(fName)
+    return filePath[-1]
+
 def sendLetter(letter: Letter, target="192.168.195.162:8426"):
     # 向目标ip和端口发送指定的信件
     pass