Skip to content

Commit 4a98df7

Browse files
author
LiChen
committed
修复因为.net版本升级后,DESDecrypt的bug
1 parent 78bb552 commit 4a98df7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/NETCore.Encrypt/EncryptProvider.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,11 @@ private static byte[] DESDecrypt(byte[] data, string key, CipherMode cipherMode,
549549
{
550550
try
551551
{
552-
byte[] tmp = new byte[encryptedBytes.Length];
553-
int len = cryptoStream.Read(tmp, 0, encryptedBytes.Length);
554-
byte[] ret = new byte[len];
555-
Array.Copy(tmp, 0, ret, 0, len);
556-
return ret;
552+
using (var outputStream = new MemoryStream())
553+
{
554+
cryptoStream.CopyTo(outputStream);
555+
return outputStream.ToArray();
556+
}
557557
}
558558
catch
559559
{

test/NETCore.Encrypt.Tests/DES_Test.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void DES_Encryt_EmptyData_Fail_Test()
4242
public void DES_Encrypt_ErrorKey_Fail_Test()
4343
{
4444
var key = "1hyhuo";
45-
var srcString = "test DES encrypt";
45+
var srcString = "test DES encrypt -t";
4646

4747
//Assert
4848
Assert.Throws<ArgumentException>(() => EncryptProvider.DESEncrypt(srcString, key));
@@ -51,7 +51,7 @@ public void DES_Encrypt_ErrorKey_Fail_Test()
5151
[Fact(DisplayName = "DES decrypt success test")]
5252
public void DES_Decryt_Success_Test()
5353
{
54-
var srcString = "test DES encrypt";
54+
var srcString = "test DES encrypt -t";
5555

5656
//Ack
5757
var encrypted = EncryptProvider.DESEncrypt(srcString, _Key);
@@ -67,7 +67,7 @@ public void DES_Decryt_Success_Test()
6767
[Fact(DisplayName = "DES CBC mode decrypt success test")]
6868
public void DES_CBCMode_Success_Test()
6969
{
70-
var srcString = "test DES encrypt";
70+
var srcString = "test DES encrypt -t";
7171

7272
//Ack
7373
var srsDatas = Encoding.UTF8.GetBytes(srcString);
@@ -93,7 +93,7 @@ public void DES_Decrypt_EmptyData_Fail_Test()
9393
public void DES_Decrypt_ErrorKey_Fail_Test()
9494
{
9595
var key = "dfafa"; //must be 24 bit
96-
var srcString = "test DES encrypt";
96+
var srcString = "test DES encrypt -t";
9797

9898
//Assert
9999
Assert.Throws<ArgumentException>(() => EncryptProvider.DESDecrypt(srcString, key));

0 commit comments

Comments
 (0)