diff --git a/src/NETCore.Encrypt/EncryptProvider.cs b/src/NETCore.Encrypt/EncryptProvider.cs index ce68b31..2ac7ba2 100644 --- a/src/NETCore.Encrypt/EncryptProvider.cs +++ b/src/NETCore.Encrypt/EncryptProvider.cs @@ -549,11 +549,11 @@ private static byte[] DESDecrypt(byte[] data, string key, CipherMode cipherMode, { try { - byte[] tmp = new byte[encryptedBytes.Length]; - int len = cryptoStream.Read(tmp, 0, encryptedBytes.Length); - byte[] ret = new byte[len]; - Array.Copy(tmp, 0, ret, 0, len); - return ret; + using (var outputStream = new MemoryStream()) + { + cryptoStream.CopyTo(outputStream); + return outputStream.ToArray(); + } } catch { diff --git a/test/NETCore.Encrypt.Tests/DES_Test.cs b/test/NETCore.Encrypt.Tests/DES_Test.cs index 55b38fe..70a7966 100644 --- a/test/NETCore.Encrypt.Tests/DES_Test.cs +++ b/test/NETCore.Encrypt.Tests/DES_Test.cs @@ -42,7 +42,7 @@ public void DES_Encryt_EmptyData_Fail_Test() public void DES_Encrypt_ErrorKey_Fail_Test() { var key = "1hyhuo"; - var srcString = "test DES encrypt"; + var srcString = "test DES encrypt -t"; //Assert Assert.Throws(() => EncryptProvider.DESEncrypt(srcString, key)); @@ -51,7 +51,7 @@ public void DES_Encrypt_ErrorKey_Fail_Test() [Fact(DisplayName = "DES decrypt success test")] public void DES_Decryt_Success_Test() { - var srcString = "test DES encrypt"; + var srcString = "test DES encrypt -t"; //Ack var encrypted = EncryptProvider.DESEncrypt(srcString, _Key); @@ -67,7 +67,7 @@ public void DES_Decryt_Success_Test() [Fact(DisplayName = "DES CBC mode decrypt success test")] public void DES_CBCMode_Success_Test() { - var srcString = "test DES encrypt"; + var srcString = "test DES encrypt -t"; //Ack var srsDatas = Encoding.UTF8.GetBytes(srcString); @@ -93,7 +93,7 @@ public void DES_Decrypt_EmptyData_Fail_Test() public void DES_Decrypt_ErrorKey_Fail_Test() { var key = "dfafa"; //must be 24 bit - var srcString = "test DES encrypt"; + var srcString = "test DES encrypt -t"; //Assert Assert.Throws(() => EncryptProvider.DESDecrypt(srcString, key));