Skip to content

Commit c551b50

Browse files
committed
update some code
1 parent d86704d commit c551b50

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src/NETCore.Encrypt/EncryptProvider.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static string AESEncrypt(string data, string key, string vector)
7979
Byte[] bVector = new Byte[16];
8080
Array.Copy(Encoding.UTF8.GetBytes(vector.PadRight(bVector.Length)), bVector, bVector.Length);
8181

82-
Byte[] Cryptograph = null; // encrypted data
82+
Byte[] encryptData = null; // encrypted data
8383
using (Aes Aes = Aes.Create())
8484
{
8585
try
@@ -93,15 +93,15 @@ public static string AESEncrypt(string data, string key, string vector)
9393
Encryptor.Write(plainBytes, 0, plainBytes.Length);
9494
Encryptor.FlushFinalBlock();
9595

96-
Cryptograph = Memory.ToArray();
96+
encryptData = Memory.ToArray();
9797
}
9898
}
9999
}
100100
catch
101101
{
102-
Cryptograph = null;
102+
encryptData = null;
103103
}
104-
return Convert.ToBase64String(Cryptograph);
104+
return Convert.ToBase64String(encryptData);
105105
}
106106
}
107107

@@ -128,7 +128,7 @@ public static string AESDecrypt(string data, string key, string vector)
128128
Byte[] bVector = new Byte[16];
129129
Array.Copy(Encoding.UTF8.GetBytes(vector.PadRight(bVector.Length)), bVector, bVector.Length);
130130

131-
Byte[] original = null; // decrypted data
131+
Byte[] decryptedData = null; // decrypted data
132132

133133
using (Aes Aes = Aes.Create())
134134
{
@@ -138,25 +138,25 @@ public static string AESDecrypt(string data, string key, string vector)
138138
{
139139
using (CryptoStream Decryptor = new CryptoStream(Memory, Aes.CreateDecryptor(bKey, bVector), CryptoStreamMode.Read))
140140
{
141-
using (MemoryStream originalMemory = new MemoryStream())
141+
using (MemoryStream tempMemory = new MemoryStream())
142142
{
143143
Byte[] Buffer = new Byte[1024];
144144
Int32 readBytes = 0;
145145
while ((readBytes = Decryptor.Read(Buffer, 0, Buffer.Length)) > 0)
146146
{
147-
originalMemory.Write(Buffer, 0, readBytes);
147+
tempMemory.Write(Buffer, 0, readBytes);
148148
}
149149

150-
original = originalMemory.ToArray();
150+
decryptedData = tempMemory.ToArray();
151151
}
152152
}
153153
}
154154
}
155155
catch
156156
{
157-
original = null;
157+
decryptedData = null;
158158
}
159-
return Encoding.UTF8.GetString(original);
159+
return Encoding.UTF8.GetString(decryptedData);
160160
}
161161
}
162162

@@ -173,7 +173,7 @@ public static string AESEncrypt(string data, string key)
173173
Check.Argument.IsNotEmpty(key, nameof(key));
174174
Check.Argument.IsNotOutOfRange(key.Length, 32, 32, nameof(key));
175175

176-
using (MemoryStream mStream = new MemoryStream())
176+
using (MemoryStream Memory = new MemoryStream())
177177
{
178178
using (Aes aes = Aes.Create())
179179
{
@@ -187,13 +187,13 @@ public static string AESEncrypt(string data, string key)
187187
//aes.Key = _key;
188188
aes.Key = bKey;
189189
//aes.IV = _iV;
190-
using (CryptoStream cryptoStream = new CryptoStream(mStream, aes.CreateEncryptor(), CryptoStreamMode.Write))
190+
using (CryptoStream cryptoStream = new CryptoStream(Memory, aes.CreateEncryptor(), CryptoStreamMode.Write))
191191
{
192192
try
193193
{
194194
cryptoStream.Write(plainBytes, 0, plainBytes.Length);
195195
cryptoStream.FlushFinalBlock();
196-
return Convert.ToBase64String(mStream.ToArray());
196+
return Convert.ToBase64String(Memory.ToArray());
197197
}
198198
catch (Exception ex)
199199
{
@@ -220,7 +220,7 @@ public static string AESDecrypt(string data, string key)
220220
Byte[] bKey = new Byte[32];
221221
Array.Copy(Encoding.UTF8.GetBytes(key.PadRight(bKey.Length)), bKey, bKey.Length);
222222

223-
using (MemoryStream mStream = new MemoryStream(encryptedBytes))
223+
using (MemoryStream Memory = new MemoryStream(encryptedBytes))
224224
{
225225
//mStream.Write( encryptedBytes, 0, encryptedBytes.Length );
226226
//mStream.Seek( 0, SeekOrigin.Begin );
@@ -231,7 +231,7 @@ public static string AESDecrypt(string data, string key)
231231
aes.KeySize = 128;
232232
aes.Key = bKey;
233233
//aes.IV = _iV;
234-
using (CryptoStream cryptoStream = new CryptoStream(mStream, aes.CreateDecryptor(), CryptoStreamMode.Read))
234+
using (CryptoStream cryptoStream = new CryptoStream(Memory, aes.CreateDecryptor(), CryptoStreamMode.Read))
235235
{
236236
try
237237
{
@@ -274,7 +274,7 @@ public static string DESEncrypt(string data, string key)
274274
Check.Argument.IsNotEmpty(key, nameof(key));
275275
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
276276

277-
using (MemoryStream mStream = new MemoryStream())
277+
using (MemoryStream Memory = new MemoryStream())
278278
{
279279
using (TripleDES des = TripleDES.Create())
280280
{
@@ -285,13 +285,13 @@ public static string DESEncrypt(string data, string key)
285285
des.Mode = CipherMode.ECB;
286286
des.Padding = PaddingMode.PKCS7;
287287
des.Key = bKey;
288-
using (CryptoStream cryptoStream = new CryptoStream(mStream, des.CreateEncryptor(), CryptoStreamMode.Write))
288+
using (CryptoStream cryptoStream = new CryptoStream(Memory, des.CreateEncryptor(), CryptoStreamMode.Write))
289289
{
290290
try
291291
{
292292
cryptoStream.Write(plainBytes, 0, plainBytes.Length);
293293
cryptoStream.FlushFinalBlock();
294-
return Convert.ToBase64String(mStream.ToArray());
294+
return Convert.ToBase64String(Memory.ToArray());
295295
}
296296
catch (Exception ex)
297297
{
@@ -318,14 +318,14 @@ public static string DESDecrypt(string data, string key)
318318
Byte[] bKey = new Byte[24];
319319
Array.Copy(Encoding.UTF8.GetBytes(key.PadRight(bKey.Length)), bKey, bKey.Length);
320320

321-
using (MemoryStream mStream = new MemoryStream(encryptedBytes))
321+
using (MemoryStream Memory = new MemoryStream(encryptedBytes))
322322
{
323323
using (TripleDES des = TripleDES.Create())
324324
{
325325
des.Mode = CipherMode.ECB;
326326
des.Padding = PaddingMode.PKCS7;
327327
des.Key = bKey;
328-
using (CryptoStream cryptoStream = new CryptoStream(mStream, des.CreateDecryptor(), CryptoStreamMode.Read))
328+
using (CryptoStream cryptoStream = new CryptoStream(Memory, des.CreateDecryptor(), CryptoStreamMode.Read))
329329
{
330330
try
331331
{

0 commit comments

Comments
 (0)