完成文件加密功能

Fork.Net/Oreo.Plugins/Oreo.FileMan/Views/MainForm.cs

@@ -33,12 +33,11 @@ namespace Oreo.FileMan.Views
                 string file = fileDialog.FileName;
                 if (File.Exists(file))
                 {
-                    string md5 = fct.GetMD5(file);
                     string newfile = file + ".fmk";
 
                     if (!File.Exists(newfile))
                     {
-                        if (FileEncryptTool.Encrypt(file, newfile, pwd))
+                        if (FileEncryptTool.Encrypt(file, newfile, pwd) > 0)
                         {
                             MessageBox.Show("恭喜你，加密成功。", "加密成功");
                         }
@@ -53,7 +52,7 @@ namespace Oreo.FileMan.Views
 
         private void BtFileDecrypt_Click(object sender, EventArgs e)
         {
-            string pwd = "123456789012";
+            string pwd = "1234567890121";
             string[] fileInfo = new string[128];
             OpenFileDialog fileDialog = new OpenFileDialog();
             fileDialog.Title = "请选择要解密的文件";
@@ -66,7 +65,7 @@ namespace Oreo.FileMan.Views
                     string newfile = file.Substring(0, file.Length - ".fmk".Length);
                     if (!File.Exists(newfile))
                     {
-                        if (FileEncryptTool.Decrypt(file, newfile, pwd))
+                        if (FileEncryptTool.Decrypt(file, newfile, pwd) > 0)
                         {
                             MessageBox.Show("恭喜你，解密成功。", "解密成功");
                         }

Fork.Net/Y.Utils/DataUtils/EncryptUtils/AesTool.cs

@@ -13,7 +13,11 @@ namespace Y.Utils.DataUtils.EncryptUtils
 {
     public class AesTool
     {
-        //byte[] keyArray = UTF8Encoding.UTF8.GetBytes("12345678901234567890123456789012");
+        private static int AESKeyLength = 32;//AES加密的密码为32位
+        private static char AESFillChar = 'Y';//AES密码填充字符
+
+        public static string DefaultPassword = "yuzhengyang";//默认密码
+
         /// <summary>
         /// 加密
         /// </summary>
@@ -22,6 +26,7 @@ namespace Y.Utils.DataUtils.EncryptUtils
         /// <returns></returns>
         public static string Encrypt(string str, string key)
         {
+            key = FmtPassword(key);
             byte[] keyArray = Encoding.UTF8.GetBytes(key);
             byte[] toEncryptArray = Encoding.UTF8.GetBytes(str);
 
@@ -43,6 +48,7 @@ namespace Y.Utils.DataUtils.EncryptUtils
         /// <returns></returns>
         public static byte[] Encrypt(byte[] array, string key)
         {
+            key = FmtPassword(key);
             byte[] keyArray = Encoding.UTF8.GetBytes(key);
 
             RijndaelManaged rDel = new RijndaelManaged();
@@ -63,6 +69,7 @@ namespace Y.Utils.DataUtils.EncryptUtils
         /// <returns></returns>
         public static string Decrypt(string str, string key)
         {
+            key = FmtPassword(key);
             byte[] keyArray = UTF8Encoding.UTF8.GetBytes(key);
             byte[] toEncryptArray = Convert.FromBase64String(str);
 
@@ -84,6 +91,7 @@ namespace Y.Utils.DataUtils.EncryptUtils
         /// <returns></returns>
         public static byte[] Decrypt(byte[] array, string key)
         {
+            key = FmtPassword(key);
             byte[] keyArray = UTF8Encoding.UTF8.GetBytes(key);
 
             RijndaelManaged rDel = new RijndaelManaged();
@@ -96,5 +104,27 @@ namespace Y.Utils.DataUtils.EncryptUtils
 
             return resultArray;
         }
+        /// <summary>
+        /// 格式化密码
+        /// </summary>
+        /// <param name="s">要格式化的密码</param>
+        /// <returns></returns>
+        public static string FmtPassword(string s)
+        {
+            string password = s ?? "";
+
+            //格式化密码
+            if (password.Length < AESKeyLength)
+            {
+                //补足不够长的密码
+                password = password + new string(AESFillChar, AESKeyLength - password.Length);
+            }
+            else if (password.Length > AESKeyLength)
+            {
+                //截取过长的密码
+                password = password.Substring(0, AESKeyLength);
+            }
+            return password;
+        }
     }
 }

Fork.Net/Y.Utils/IOUtils/FileUtils/FileEncryptTool.cs

@@ -9,10 +9,8 @@ namespace Y.Utils.IOUtils.FileUtils
 {
     public class FileEncryptTool
     {
-        private static int AESKeyLength = 32;//AES加密的密码为32位
-        private static char AESFillChar = 'Y';//AES密码填充字符
         private static string FileTypeDesc = "Oreo.FileMan.EncryptFile";
-        private static int FileHeadLength = 128;
+        private static int FileHeadLength = 256;
         private static int FileBuffer = 1024 * 1024;
 
         /// <summary>
@@ -21,99 +19,83 @@ namespace Y.Utils.IOUtils.FileUtils
         /// <param name="srcFile"></param>
         /// <param name="dstFile"></param>
         /// <param name="password"></param>
-        /// <returns></returns>
-        public static bool Encrypt(string srcFile, string dstFile, string password)
+        /// <returns>
+        /// 1：操作成功
+        /// -11：要加密的文件不存在
+        /// -12：加密后的目标文件已存在
+        /// -404：未知错误，操作失败
+        /// </returns>
+        public static int Encrypt(string srcFile, string dstFile, string password)
         {
-            string fmtPwd = FmtPassword(password);
-            string pwdMd5 = MD5Tool.Encrypt(fmtPwd);
-            //检测文件存在
-            if (File.Exists(srcFile) && !File.Exists(dstFile))
+            DateTime begin = DateTime.Now;
+            if (!File.Exists(srcFile)) return -11; //要加密的文件不存在
+            if (File.Exists(dstFile)) return -12;//加密后的目标文件已存在
+
+            string fmtPwd = AesTool.FmtPassword(password);
+            string pwdMd5 = MD5Tool.Encrypt(MD5Tool.Encrypt(fmtPwd));
+
+            string md5 = FileTool.GetMD5(srcFile);
+            using (FileStream fsRead = new FileStream(srcFile, FileMode.Open))
             {
-                string md5 = FileTool.GetMD5(srcFile);
-                using (FileStream fsRead = new FileStream(srcFile, FileMode.Open))
+                using (FileStream fsWrite = new FileStream(dstFile, FileMode.Create))
                 {
-                    using (FileStream fsWrite = new FileStream(dstFile, FileMode.Create))
+                    try
                     {
-                        try
-                        {
-                            //文件头部数据定义
-                            List<byte[]> headdata = new List<byte[]>()
+                        //文件头部数据定义
+                        List<byte[]> headdata = new List<byte[]>()
                             {
                                 Encoding.Default.GetBytes(FileTypeDesc),
                                 Encoding.Default.GetBytes(md5),
-                                Encoding.Default.GetBytes(fmtPwd),
-                                Encoding.Default.GetBytes(pwdMd5)
+                                Encoding.Default.GetBytes(AesTool.Encrypt(fmtPwd,AesTool.DefaultPassword)),
+                                Encoding.Default.GetBytes(pwdMd5),
+                                Encoding.Default.GetBytes(DateTime.Now.ToString())
                             };
-                            //写入长度
-                            for (int i = 0; i < FileHeadLength; i++)
+                        //写入长度
+                        for (int i = 0; i < FileHeadLength; i++)
+                        {
+                            if (headdata.Count > i)
                             {
-                                if (headdata.Count > i)
-                                {
-                                    byte[] length = BitConverter.GetBytes(headdata[i].Length);
-                                    fsWrite.Write(length, 0, length.Length);
-                                }
-                                else
-                                {
-                                    byte[] length = BitConverter.GetBytes(0);
-                                    fsWrite.Write(length, 0, length.Length);
-                                }
+                                byte[] length = BitConverter.GetBytes(headdata[i].Length);
+                                fsWrite.Write(length, 0, length.Length);
                             }
-                            //写入数据
-                            for (int i = 0; i < headdata.Count; i++)
+                            else
                             {
-                                fsWrite.Write(headdata[i], 0, headdata[i].Length);
+                                byte[] length = BitConverter.GetBytes(0);
+                                fsWrite.Write(length, 0, length.Length);
                             }
+                        }
+                        //写入数据
+                        for (int i = 0; i < headdata.Count; i++)
+                        {
+                            fsWrite.Write(headdata[i], 0, headdata[i].Length);
+                        }
 
-                            //设置文件头部信息
-                            //byte[] typeByte = Encoding.Default.GetBytes(FileTypeDesc);
-                            //byte[] md5Byte = Encoding.Default.GetBytes(md5);
-                            //byte[] pwdByte = Encoding.Default.GetBytes(fmtPwd);
-                            //byte[] pwdMd5Byte = Encoding.Default.GetBytes(pwdMd5);
-                            //设置文件头部数据长度信息
-                            //long[] headpart = new long[FileHeadLength];
-                            //headpart[0] = typeByte.Length;
-                            //headpart[1] = md5Byte.Length;
-                            //headpart[2] = pwdByte.Length;
-                            //headpart[3] = pwdMd5Byte.Length;
-                            //写入头部长度信息
-                            //foreach (var h in headpart)
-                            //{
-                            //    byte[] temp = BitConverter.GetBytes(h);
-                            //    fsWrite.Write(temp, 0, temp.Length);
-                            //}
-                            //写入文件头部信息
-                            //fsWrite.Write(typeByte, 0, typeByte.Length);
-                            //fsWrite.Write(md5Byte, 0, md5Byte.Length);
-                            //fsWrite.Write(pwdByte, 0, pwdByte.Length);
-                            //fsWrite.Write(pwdMd5Byte, 0, pwdMd5Byte.Length);
-
-                            //写入文件源数据
-                            int readCount = 0;
-                            byte[] buffer = new byte[FileBuffer];
-                            while ((readCount = fsRead.Read(buffer, 0, buffer.Length)) > 0)
+                        //写入文件源数据
+                        int readCount = 0;
+                        byte[] buffer = new byte[FileBuffer];
+                        while ((readCount = fsRead.Read(buffer, 0, buffer.Length)) > 0)
+                        {
+                            if (readCount != buffer.Length)
+                            {
+                                byte[] temp = new byte[readCount];
+                                Buffer.BlockCopy(buffer, 0, temp, 0, readCount);
+                                byte[] enbyte = AesTool.Encrypt(temp, fmtPwd);
+                                fsWrite.Write(enbyte, 0, enbyte.Length);
+                            }
+                            else
                             {
-                                if (readCount != buffer.Length)
-                                {
-                                    byte[] temp = new byte[readCount];
-                                    Buffer.BlockCopy(buffer, 0, temp, 0, readCount);
-                                    byte[] enbyte = AesTool.Encrypt(temp, fmtPwd);
-                                    fsWrite.Write(enbyte, 0, enbyte.Length);
-                                }
-                                else
-                                {
-                                    byte[] enbyte = AesTool.Encrypt(buffer, fmtPwd);
-                                    fsWrite.Write(enbyte, 0, enbyte.Length);
-                                }
+                                byte[] enbyte = AesTool.Encrypt(buffer, fmtPwd);
+                                fsWrite.Write(enbyte, 0, enbyte.Length);
                             }
-                            return true;
                         }
-                        catch { }
+                        return 1;//操作成功
                     }
+                    catch (Exception e) { }
                 }
                 //加密失败后，删除加密的文件
-                try { File.Delete(dstFile); } catch { }
+                try { File.Delete(dstFile); } catch (Exception e) { }
             }
-            return false;
+            return -404;//未知错误，操作失败
         }
         /// <summary>
         /// 文件解密
@@ -121,108 +103,72 @@ namespace Y.Utils.IOUtils.FileUtils
         /// <param name="srcFile"></param>
         /// <param name="dstFile"></param>
         /// <param name="password"></param>
-        /// <returns></returns>
-        public static bool Decrypt(string srcFile, string dstFile, string password)
+        /// <returns>
+        /// 1：操作成功
+        /// -11：要解密的文件不存在
+        /// -12：解密后的目标文件已存在
+        /// -90：解锁密码错误
+        /// -404：未知错误，操作失败
+        /// </returns>
+        public static int Decrypt(string srcFile, string dstFile, string password)
         {
-            string fmtPwd = FmtPassword(password);
-            string pwdMd5 = MD5Tool.Encrypt(fmtPwd);
-            //检测文件存在
-            if (File.Exists(srcFile) && !File.Exists(dstFile))
+            if (!File.Exists(srcFile)) return -11;//要解密的文件不存在
+            if (File.Exists(dstFile)) return -12;//解密后的目标文件已存在
+
+            string fmtPwd = AesTool.FmtPassword(password);
+            string pwdMd5 = MD5Tool.Encrypt(MD5Tool.Encrypt(fmtPwd));
+            List<string> headdata = new List<string>();
+            using (FileStream fsRead = new FileStream(srcFile, FileMode.Open))
             {
-                string[] fileInfo = new string[FileHeadLength];
-                using (FileStream fsRead = new FileStream(srcFile, FileMode.Open))
+                using (FileStream fsWrite = new FileStream(dstFile, FileMode.Create))
                 {
-                    using (FileStream fsWrite = new FileStream(dstFile, FileMode.Create))
+                    try
                     {
-                        try
+                        byte[] headlength = new byte[4 * FileHeadLength];
+                        if (fsRead.Read(headlength, 0, headlength.Length) == headlength.Length)
                         {
-                            List<byte[]> headdata = new List<byte[]>();
-                            for()
-
-                            byte[] headpart = new byte[8 * FileHeadLength];//fmk文件头
-                            long[] dataLong = new long[FileHeadLength];//信息长度
-                            if (fsRead.Read(headpart, 0, headpart.Length) == headpart.Length)
+                            for (int i = 0; i < FileHeadLength; i++)
                             {
-                                //读取信息长度
-                                for (int i = 0; i < dataLong.Length; i++)
-                                {
-                                    dataLong[i] = BitConverter.ToInt64(headpart, i * 8);
-                                }
-                                byte[] typeByte = new byte[dataLong[0]];
-                                byte[] md5Byte = new byte[dataLong[1]];
-                                byte[] pwdByte = new byte[dataLong[2]];
-                                byte[] pwdMd5Byte = new byte[dataLong[3]];
-
-                                fsRead.Read(typeByte, 0, typeByte.Length);
-                                fsRead.Read(md5Byte, 0, md5Byte.Length);
-                                fsRead.Read(pwdByte, 0, pwdByte.Length);
-                                fsRead.Read(pwdMd5Byte, 0, pwdMd5Byte.Length);
-
-                                fileInfo[0] = Encoding.Default.GetString(typeByte);
-                                fileInfo[1] = Encoding.Default.GetString(md5Byte);
-                                fileInfo[2] = Encoding.Default.GetString(pwdByte);
-                                fileInfo[3] = Encoding.Default.GetString(pwdMd5Byte);
+                                int datalong = BitConverter.ToInt32(headlength, i * 4);
+                                byte[] tempdata = new byte[datalong];
+                                fsRead.Read(tempdata, 0, datalong);
+                                headdata.Add(Encoding.Default.GetString(tempdata));
                             }
+                        }
+                        if (pwdMd5 != headdata[3]) return -90;//解锁密码错误
 
-                            if (pwdMd5 == fileInfo[3])
+                        int readCount = 0;
+                        byte[] buffer = new byte[FileBuffer + 16];
+                        while ((readCount = fsRead.Read(buffer, 0, buffer.Length)) > 0)
+                        {
+                            if (readCount != buffer.Length)
+                            {
+                                byte[] temp = new byte[readCount];
+                                Buffer.BlockCopy(buffer, 0, temp, 0, readCount);
+                                byte[] debyte = AesTool.Decrypt(temp, fmtPwd);
+                                fsWrite.Write(debyte, 0, debyte.Length);
+                            }
+                            else
                             {
-                                int readCount = 0;
-                                byte[] buffer = new byte[FileBuffer + 16];
-                                while ((readCount = fsRead.Read(buffer, 0, buffer.Length)) > 0)
-                                {
-                                    if (readCount != buffer.Length)
-                                    {
-                                        byte[] temp = new byte[readCount];
-                                        Buffer.BlockCopy(buffer, 0, temp, 0, readCount);
-                                        byte[] debyte = AesTool.Decrypt(temp, fmtPwd);
-                                        fsWrite.Write(debyte, 0, debyte.Length);
-                                    }
-                                    else
-                                    {
-                                        byte[] debyte = AesTool.Decrypt(buffer, fmtPwd);
-                                        fsWrite.Write(debyte, 0, debyte.Length);
-                                    }
-                                }
+                                byte[] debyte = AesTool.Decrypt(buffer, fmtPwd);
+                                fsWrite.Write(debyte, 0, debyte.Length);
                             }
                         }
-                        catch { }
                     }
-                }
-                string md5 = FileTool.GetMD5(dstFile);
-                if (md5 == fileInfo[1])
-                {
-                    return true;
-                }
-                else
-                {
-                    //解密失败后，删除解密的文件
-                    try { File.Delete(dstFile); } catch { }
+                    catch (Exception e) { }
                 }
             }
-            return false;
-        }
-
-        /// <summary>
-        /// 格式化密码
-        /// </summary>
-        /// <param name="s">要格式化的密码</param>
-        /// <returns></returns>
-        private static string FmtPassword(string s)
-        {
-            string password = s ?? "";
-
-            //格式化密码
-            if (password.Length < AESKeyLength)
+            string md5 = FileTool.GetMD5(dstFile);
+            if (md5 == headdata[1])
             {
-                //补足不够长的密码
-                password = password + new string(AESFillChar, AESKeyLength - password.Length);
+                return 1;//操作成功
             }
-            else if (password.Length > AESKeyLength)
+            else
             {
-                //截取过长的密码
-                password = password.Substring(0, AESKeyLength);
+                //解密失败后，删除解密的文件
+                try { File.Delete(dstFile); } catch (Exception e) { }
             }
-            return password;
+            return -404;//未知错误，操作失败
         }
     }
 }

Fork.Net/Y.Utils/Y.Utils.csproj

@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\Debug\Y.Utils.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>