From 7dbe05745790e338ccadf1d8195ad7e0b91688d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=A4=A9=E5=9E=9A?= <huty@hty1024.com>
Date: Fri, 15 Mar 2024 16:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0bf=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bf | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bf b/bf
index d7a3b29..635d04f 100755
--- a/bf
+++ b/bf
@@ -90,7 +90,7 @@ generateSHA () {
   mkdir -pv $targetsPath
   mv $backupFileName'_SHA512' $targetsPath
   echo '------------------------------ 备份文件哈希生成成功（ 哈希文件见：' $targetsPath ' ）！ ------------------------------'
-  echo '哈希校验方式：' 
+  echo '哈希校验方式：' openssl dgst -sha512 $backupFileName 
 }
 ## 使用宿主机内置的 OpenSSL 加密
 encryptByHost () {
@@ -100,8 +100,10 @@ encryptByHost () {
   openssl enc -e -aes256 -a -kfile $encryptPasswordFile -in bak_$backupFileName -out $backupFileName
   rm -rf bak_$backupFileName
   echo '------------------------------ 使用主机内置 OpenSSL 加密完成！ ------------------------------'
-  echo 'OpenSSL 版本号：' openssl version ' ，解密时请确保版本一致！'
-  echo '解密命令：' openssl enc -d -aes256 -a -kfile $encryptPasswordFile -in $backupFileName -out 1_$backupFileName
+  echo 'OpenSSL 版本号：' 
+  openssl version
+  echo '解密命令：' 
+  echo openssl enc -d -aes256 -a -kfile $encryptPasswordFile -in $backupFileName -out 1_$backupFileName
 }
 ## 使用 Docker 运行 OpenSSL 容器加密
 encryptByDocker () {
@@ -111,16 +113,18 @@ encryptByDocker () {
   cp -rpf $encryptPasswordFile ./data/key
   mv $backupFileName ./data/bak_$backupFileName
   chown 1024.1024 -R ./data
-  docker run -dit --name openssl -v ./data:/data $opensslImage
-  docker exec -it openssl openssl enc -e -aes256 -a -kfile /data/key -in /data/bak_$backupFileName -out /data/$backupFileName
+  docker run -dit --name openssl_temp -v ./data:/data $opensslImage
+  docker exec -it openssl_temp openssl enc -e -aes256 -a -kfile /data/key -in /data/bak_$backupFileName -out /data/$backupFileName
   cp -rpf data/$backupFileName ./
-  docker rm -f openssl
+  docker rm -f openssl_temp
   rm -rf data
   echo '------------------------------ 使用 OpenSSL Docker 容器加密完成！ ------------------------------'
-  echo 'Docker 镜像：' $opensslImage
+  echo 'Docker 镜像：' 
+  echo $opensslImage
   echo '解密命令：' 
   echo cp -rpf $backupFileName ./data/$backupFileName
   echo cp -rpf $encryptPasswordFile ./data/key
+  echo chown -R 1024.1024 ./data
   echo docker run -dit --name openssl -v ./data:/data $opensslImage
   echo docker exec -it openssl openssl enc -d -aes256 -a -kfile /data/key -in /data/$backupFileName -out /data/1_$backupFileName
 }