From 8ee4a2e1364b14c9d0ff91f085dc05f70ad26038 Mon Sep 17 00:00:00 2001
From: Timmoc <timmoc@qq.com>
Date: Tue, 26 Nov 2024 14:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3base64=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 recv/recv.py      | 4 ++--
 recv/test_recv.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recv/recv.py b/recv/recv.py
index 82802a8..ee4a775 100644
--- a/recv/recv.py
+++ b/recv/recv.py
@@ -40,9 +40,9 @@ def handleLetter(letter: Letter):
     elif type == config.EncryptType.SM4_CBC:
         data = base64.b64decode(SM4.decrypt_cbc_with_iv(letter.fileBase64, key))
     elif type == config.EncryptType.AES_ECB:
-        data = AES.AESUtils(key).decrypt(key, letter.fileBase64, "ecb")
+        data = base64.b64decode(AES.AESUtils(key).decrypt(key, letter.fileBase64, "ecb"))
     elif type == config.EncryptType.AES_CBC:
-        data = AES.AESUtils(key).decrypt(key, letter.fileBase64,"cbc")
+        data = base64.b64decode(AES.AESUtils(key).decrypt(key, letter.fileBase64,"cbc"))
     else:
         raise KeyError("不支持的对称加密算法")
 
diff --git a/recv/test_recv.py b/recv/test_recv.py
index 8a80588..1106e10 100644
--- a/recv/test_recv.py
+++ b/recv/test_recv.py
@@ -25,7 +25,7 @@ def test_handleLetter_sm4_ecb(mock_input):
     pass
 
 
-@patch('builtins.input', side_effect=['./public.pem', 'aes', 'cbc'])
+@patch('builtins.input', side_effect=['./public.pem', 'sm4', 'cbc'])
 def test_handleLetter_sm4_cbc(mock_input):
     letter = sender.main()
     recv.handleLetter(letter)