Skip to content

Commit 6ed53a4

Browse files
myloveCcmyloveCc
committed
Update arugment length check method to 'IsEqualLength'.
1 parent b5b93fb commit 6ed53a4

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎src/NETCore.Encrypt/EncryptProvider.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ public static string AESEncrypt(string data, string key, string vector)
8181
Check.Argument.IsNotEmpty(data, nameof(data));
8282

8383
Check.Argument.IsNotEmpty(key, nameof(key));
84-
Check.Argument.IsNotOutOfRange(key.Length, 32, 32, nameof(key));
84+
Check.Argument.IsEqualLength(key.Length, 32, nameof(key));
8585

8686
Check.Argument.IsNotEmpty(vector, nameof(vector));
87-
Check.Argument.IsNotOutOfRange(vector.Length, 16, 16, nameof(vector));
87+
Check.Argument.IsEqualLength(vector.Length, 16, nameof(vector));
8888

8989
byte[] plainBytes = Encoding.UTF8.GetBytes(data);
9090

@@ -108,10 +108,10 @@ public static byte[] AESEncrypt(byte[] data, string key, string vector)
108108
Check.Argument.IsNotEmpty(data, nameof(data));
109109

110110
Check.Argument.IsNotEmpty(key, nameof(key));
111-
Check.Argument.IsNotOutOfRange(key.Length, 32, 32, nameof(key));
111+
Check.Argument.IsEqualLength(key.Length, 32, nameof(key));
112112

113113
Check.Argument.IsNotEmpty(vector, nameof(vector));
114-
Check.Argument.IsNotOutOfRange(vector.Length, 16, 16, nameof(vector));
114+
Check.Argument.IsEqualLength(vector.Length, 16, nameof(vector));
115115

116116
byte[] plainBytes = data;
117117
byte[] bKey = new byte[32];
@@ -157,10 +157,10 @@ public static string AESDecrypt(string data, string key, string vector)
157157
Check.Argument.IsNotEmpty(data, nameof(data));
158158

159159
Check.Argument.IsNotEmpty(key, nameof(key));
160-
Check.Argument.IsNotOutOfRange(key.Length, 32, 32, nameof(key));
160+
Check.Argument.IsEqualLength(key.Length, 32, nameof(key));
161161

162162
Check.Argument.IsNotEmpty(vector, nameof(vector));
163-
Check.Argument.IsNotOutOfRange(vector.Length, 16, 16, nameof(vector));
163+
Check.Argument.IsEqualLength(vector.Length, 16, nameof(vector));
164164

165165
byte[] encryptedBytes = Convert.FromBase64String(data);
166166

@@ -186,10 +186,10 @@ public static byte[] AESDecrypt(byte[] data, string key, string vector)
186186
Check.Argument.IsNotEmpty(data, nameof(data));
187187

188188
Check.Argument.IsNotEmpty(key, nameof(key));
189-
Check.Argument.IsNotOutOfRange(key.Length, 32, 32, nameof(key));
189+
Check.Argument.IsEqualLength(key.Length, 32, nameof(key));
190190

191191
Check.Argument.IsNotEmpty(vector, nameof(vector));
192-
Check.Argument.IsNotOutOfRange(vector.Length, 16, 16, nameof(vector));
192+
Check.Argument.IsEqualLength(vector.Length, 16, nameof(vector));
193193

194194
byte[] encryptedBytes = data;
195195
byte[] bKey = new byte[32];
@@ -240,7 +240,7 @@ public static string AESEncrypt(string data, string key)
240240
{
241241
Check.Argument.IsNotEmpty(data, nameof(data));
242242
Check.Argument.IsNotEmpty(key, nameof(key));
243-
Check.Argument.IsNotOutOfRange(key.Length, 32, 32, nameof(key));
243+
Check.Argument.IsEqualLength(key.Length, 32, nameof(key));
244244

245245
using (MemoryStream memory = new MemoryStream())
246246
{
@@ -282,7 +282,7 @@ public static string AESDecrypt(string data, string key)
282282
{
283283
Check.Argument.IsNotEmpty(data, nameof(data));
284284
Check.Argument.IsNotEmpty(key, nameof(key));
285-
Check.Argument.IsNotOutOfRange(key.Length, 32, 32, nameof(key));
285+
Check.Argument.IsEqualLength(key.Length, 32, nameof(key));
286286

287287
byte[] encryptedBytes = Convert.FromBase64String(data);
288288
byte[] bKey = new byte[32];
@@ -358,7 +358,7 @@ public static string DESEncrypt(string data, string key)
358358
{
359359
Check.Argument.IsNotEmpty(data, nameof(data));
360360
Check.Argument.IsNotEmpty(key, nameof(key));
361-
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
361+
Check.Argument.IsEqualLength(key.Length, 24, nameof(key));
362362

363363
byte[] plainBytes = Encoding.UTF8.GetBytes(data);
364364
var encryptBytes = DESEncrypt(plainBytes, key, CipherMode.ECB);
@@ -380,7 +380,7 @@ public static byte[] DESEncrypt(byte[] data, string key)
380380
{
381381
Check.Argument.IsNotEmpty(data, nameof(data));
382382
Check.Argument.IsNotEmpty(key, nameof(key));
383-
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
383+
Check.Argument.IsEqualLength(key.Length, 24, nameof(key));
384384

385385
return DESEncrypt(data, key, CipherMode.ECB);
386386
}
@@ -397,9 +397,9 @@ public static byte[] DESEncrypt(byte[] data, string key, string vector)
397397
{
398398
Check.Argument.IsNotEmpty(data, nameof(data));
399399
Check.Argument.IsNotEmpty(key, nameof(key));
400-
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
400+
Check.Argument.IsEqualLength(key.Length, 24, nameof(key));
401401
Check.Argument.IsNotEmpty(vector, nameof(vector));
402-
Check.Argument.IsNotOutOfRange(vector.Length, 8, 8, nameof(vector));
402+
Check.Argument.IsEqualLength(vector.Length, 8, nameof(vector));
403403

404404
return DESEncrypt(data, key, CipherMode.CBC, vector);
405405
}
@@ -417,7 +417,7 @@ private static byte[] DESEncrypt(byte[] data, string key, CipherMode cipherMode,
417417
{
418418
Check.Argument.IsNotEmpty(data, nameof(data));
419419
Check.Argument.IsNotEmpty(key, nameof(key));
420-
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
420+
Check.Argument.IsEqualLength(key.Length, 24, nameof(key));
421421

422422
using (MemoryStream Memory = new MemoryStream())
423423
{
@@ -465,7 +465,7 @@ public static string DESDecrypt(string data, string key)
465465
{
466466
Check.Argument.IsNotEmpty(data, nameof(data));
467467
Check.Argument.IsNotEmpty(key, nameof(key));
468-
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
468+
Check.Argument.IsEqualLength(key.Length, 24, nameof(key));
469469

470470
byte[] encryptedBytes = Convert.FromBase64String(data);
471471
byte[] bytes = DESDecrypt(encryptedBytes, key, CipherMode.ECB);
@@ -487,7 +487,7 @@ public static byte[] DESDecrypt(byte[] data, string key)
487487
{
488488
Check.Argument.IsNotEmpty(data, nameof(data));
489489
Check.Argument.IsNotEmpty(key, nameof(key));
490-
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
490+
Check.Argument.IsEqualLength(key.Length, 24, nameof(key));
491491

492492
return DESDecrypt(data, key, CipherMode.ECB);
493493
}
@@ -503,9 +503,9 @@ public static byte[] DESDecrypt(byte[] data, string key, string vector)
503503
{
504504
Check.Argument.IsNotEmpty(data, nameof(data));
505505
Check.Argument.IsNotEmpty(key, nameof(key));
506-
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
506+
Check.Argument.IsEqualLength(key.Length, 24, nameof(key));
507507
Check.Argument.IsNotEmpty(vector, nameof(vector));
508-
Check.Argument.IsNotOutOfRange(vector.Length, 8, 8, nameof(vector));
508+
Check.Argument.IsEqualLength(vector.Length, 8, nameof(vector));
509509

510510
return DESDecrypt(data, key, CipherMode.CBC, vector);
511511
}
@@ -522,7 +522,7 @@ private static byte[] DESDecrypt(byte[] data, string key, CipherMode cipherMode,
522522
{
523523
Check.Argument.IsNotEmpty(data, nameof(data));
524524
Check.Argument.IsNotEmpty(key, nameof(key));
525-
Check.Argument.IsNotOutOfRange(key.Length, 24, 24, nameof(key));
525+
Check.Argument.IsEqualLength(key.Length, 24, nameof(key));
526526

527527
byte[] encryptedBytes = data;
528528
byte[] bKey = new byte[24];

‎src/NETCore.Encrypt/Shared/Check.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ public static void IsNotEmpty<T>(ICollection<T> argument, string argumentName)
165165
throw new ArgumentException("The collection can't be empty.", argumentName);
166166
}
167167
}
168+
168169
public static void IsNotOutOfRange(int argument, int min, int max, string argumentName)
169170
{
170171
if ((argument < min) || (argument > max))
@@ -173,7 +174,6 @@ public static void IsNotOutOfRange(int argument, int min, int max, string argume
173174
}
174175
}
175176

176-
177177
/// <summary>
178178
/// Equal the length
179179
/// </summary>

0 commit comments

Comments
 (0)