remove ctor; revert tests; remove unused _iv member

zybexXL · Nov 13, 2023 · 36cea67 · 36cea67
1 parent 799a5c5
commit 36cea67
Show file tree

Hide file tree

Showing 4 changed files with 192 additions and 392 deletions.
diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.CtrImpl.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.CtrImpl.cs
@@ -12,7 +12,6 @@ public partial class AesCipher
         private sealed class CtrImpl : BlockCipher, IDisposable
         {
             private readonly Aes _aes;
-            private readonly byte[] _iv;
             private readonly uint[] _packedIV;
             private readonly ICryptoTransform _encryptor;
 
@@ -28,7 +27,6 @@ public CtrImpl(
                 _aes = aes;
                 _encryptor = aes.CreateEncryptor();
 
-                _iv = iv;
                 _packedIV = GetPackedIV(iv);
             }
 

diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.cs
@@ -37,20 +37,6 @@ public sealed partial class AesCipher : BlockCipher, IDisposable
     {
         private readonly BlockCipher _impl;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AesCipher"/> class.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="mode">The mode.</param>
-        /// <param name="padding">The padding.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
-        /// <exception cref="ArgumentException">Keysize is not valid for this algorithm.</exception>
-        public AesCipher(byte[] key, CipherMode mode, CipherPadding padding)
-            : base(key, 16, mode, padding)
-        {
-            _impl = new BlockImpl(key, mode, padding);
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="AesCipher"/> class.
         /// </summary>

diff --git a/test/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/AesCipherTest.Gen.cs.txt b/test/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/AesCipherTest.Gen.cs.txt
@@ -4,20 +4,20 @@
 // expected encrypted values, and also verifies those values against the .NET
 // BCL implementation as an extra validation before generating the tests.
 
-Dictionary<string, (string, string, CipherMode?)> modes = new()
+Dictionary<string, (string, CipherMode?)> modes = new()
 {
-    ["ecb"] = ("mode: null", "iv: null, AesCipherMode.ECB", CipherMode.ECB),
-    ["cbc"] = ("new CbcCipherMode((byte[])iv.Clone())", "(byte[])iv.Clone(), AesCipherMode.CBC", CipherMode.CBC),
-    ["cfb"] = ("new CfbCipherMode((byte[])iv.Clone())", "(byte[])iv.Clone(), AesCipherMode.CFB", CipherMode.CFB),
-    ["ctr"] = ("new CtrCipherMode((byte[])iv.Clone())", "(byte[])iv.Clone(), AesCipherMode.CTR", null),
-    ["ofb"] = ("new OfbCipherMode((byte[])iv.Clone())", "(byte[])iv.Clone(), AesCipherMode.OFB", CipherMode.OFB),
+    ["ecb"] = ("iv: null, AesCipherMode.ECB", CipherMode.ECB),
+    ["cbc"] = ("(byte[])iv.Clone(), AesCipherMode.CBC", CipherMode.CBC),
+    ["cfb"] = ("(byte[])iv.Clone(), AesCipherMode.CFB", CipherMode.CFB),
+    ["ctr"] = ("(byte[])iv.Clone(), AesCipherMode.CTR", null),
+    ["ofb"] = ("(byte[])iv.Clone(), AesCipherMode.OFB", CipherMode.OFB),
 };
 
 Random random = new(123);
 
 using IndentedTextWriter tw = new(Console.Out);
 
-foreach ((string mode, (string ctor1Code, string ctor2Code, CipherMode? bclMode)) in modes)
+foreach ((string mode, (string modeCode, CipherMode? bclMode)) in modes)
 {
     foreach (int keySize in new int[] { 128, 192, 256 })
     {
@@ -90,7 +90,8 @@ foreach ((string mode, (string ctor1Code, string ctor2Code, CipherMode? bclMode)
             tw.WriteLine($"// {openSslCmd} | hd"); // pipe to hexdump
             WriteBytes(expected);
             tw.WriteLine();
-            tw.WriteLine($"var actual = new AesCipher(key, {ctor1Code}, padding: null).Encrypt(input);");
+            tw.WriteLine($"var actual = new AesCipher(key, {modeCode}, pkcs7Padding: false).Encrypt(input);");
+            tw.WriteLine();
             tw.WriteLine($"CollectionAssert.AreEqual(expected, actual);");
 
             if (bclMode is not null and not CipherMode.OFB)
@@ -116,14 +117,9 @@ foreach ((string mode, (string ctor1Code, string ctor2Code, CipherMode? bclMode)
             }
 
             tw.WriteLine();
-            tw.WriteLine($"var decrypted = new AesCipher(key, {ctor1Code}, padding: null).Decrypt(actual);");
-            tw.WriteLine($"CollectionAssert.AreEqual(input, decrypted);");
-            tw.WriteLine();
-            tw.WriteLine($"var actual2 = new AesCipher(key, {ctor2Code}, pkcs7Padding: false).Encrypt(input);");
-            tw.WriteLine($"CollectionAssert.AreEqual(expected, actual2);");
+            tw.WriteLine($"var decrypted = new AesCipher(key, {modeCode}, pkcs7Padding: false).Decrypt(actual);");
             tw.WriteLine();
-            tw.WriteLine($"var decrypted2 = new AesCipher(key, {ctor2Code}, pkcs7Padding: false).Decrypt(actual);");
-            tw.WriteLine($"CollectionAssert.AreEqual(input, decrypted2);");
+            tw.WriteLine($"CollectionAssert.AreEqual(input, decrypted);");
 
             tw.Indent--;
             tw.WriteLine("}");