Minor fixes

sshnet · Nov 1, 2023 · 086ad43 · 086ad43
1 parent 5cc5d4a
commit 086ad43
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Renci.SshNet/Security/Cryptography/BlockCipher.cs b/src/Renci.SshNet/Security/Cryptography/BlockCipher.cs
@@ -76,7 +76,7 @@ public override byte[] Encrypt(byte[] input, int offset, int length)
         {
             if (length % _blockSize > 0)
             {
-                    if (_padding is null)
+                if (_padding is null)
                 {
                     throw new ArgumentException("data");
                 }
@@ -135,17 +135,18 @@ public override byte[] Decrypt(byte[] input, int offset, int length)
         {
             if (length % _blockSize > 0)
             {
-                    if (_padding is null)
+                if (_padding is null)
                 {
                     throw new ArgumentException("data");
                 }
 
-                    input = _padding.Pad(_blockSize, input, offset, length);
-                    offset = 0;
-                    length = input.Length;
+                input = _padding.Pad(_blockSize, input, offset, length);
+                offset = 0;
+                length = input.Length;
             }
 
             var output = new byte[length];
+
             var writtenBytes = 0;
             for (var i = 0; i < length / _blockSize; i++)
             {

diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipher.cs
@@ -705,7 +705,7 @@ public override byte[] Decrypt(byte[] input, int offset, int length)
                 return _aesCSP.Decrypt(input, offset, length);
             }
 
-            return base.Encrypt(input, offset, length);
+            return base.Decrypt(input, offset, length);
         }
 
         private uint[] GenerateWorkingKey(bool isEncryption, byte[] key)

diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipherCSP.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/AesCipherCSP.cs
@@ -4,9 +4,6 @@
 
 namespace Renci.SshNet.Security.Cryptography.Ciphers
 {
-    // allow ECB in this class
-#pragma warning disable CA5358
-
     /// <summary>
     /// AES cipher implementation using the accelerated AesCryptoServiceProvider
     /// This CSP makes use of AES-NI instructions if available (faster, less CPU usage).
@@ -128,7 +125,9 @@ private bool InitCryptoServiceProvider(byte[] key, byte[] iv)
                 using var aesProvider = CSP.Aes.Create();
                 aesProvider.BlockSize = _blockSize * 8;
                 aesProvider.KeySize = key.Length * 8;
+#pragma warning disable CA5358 // allow ECB
                 aesProvider.Mode = _isCTRMode ? CSP.CipherMode.ECB : CSP.CipherMode.CBC;    // CTR uses ECB
+#pragma warning restore CA5358
                 aesProvider.Padding = CSP.PaddingMode.None;
                 aesProvider.Key = key;
                 aesProvider.IV = iv;

diff --git a/src/Renci.SshNet/Security/Cryptography/Ciphers/CipherMode.cs b/src/Renci.SshNet/Security/Cryptography/Ciphers/CipherMode.cs
@@ -17,7 +17,7 @@ public abstract class CipherMode
         /// <summary>
         /// Gets the IV vector.
         /// </summary>
-        internal byte[] IV {get; private set;}
+        internal byte[] IV;
 
         /// <summary>
         /// Holds block size of the cipher.