Fixed some warnings.

Author: drieseng

src/Renci.SshNet/Common/DerData.cs

@@ -74,7 +74,7 @@ public DerData()
         public DerData(byte[] data)
         {
             _data = new List<byte>(data);
-            var dataType = ReadByte();
+            ReadByte(); // skip dataType
             var length = ReadLength();
             _lastIndex = _readerIndex + length;
         }
@@ -160,7 +160,7 @@ public void Write(bool data)
         /// Writes UInt32 data into internal buffer.
         /// </summary>
         /// <param name="data">UInt32 data to write.</param>
-        public void Write(UInt32 data)
+        public void Write(uint data)
         {
             var bytes = data.GetBytes();
             _data.Add(Integer);

src/Renci.SshNet/Messages/Transport/NewKeysMessage.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Renci.SshNet.Messages.Transport
+namespace Renci.SshNet.Messages.Transport
 {
     /// <summary>
     /// Represents SSH_MSG_NEWKEYS message.

src/Renci.SshNet/Security/Cryptography/Ciphers/TwofishCipher.cs

@@ -51,7 +51,7 @@ public TwofishCipher(byte[] key, CipherMode mode, CipherPadding padding)
                 gMDS3[i] = mX[P_30] | m1[P_30] << 8 | mY[P_30] << 16 | mX[P_30] << 24;
             }
 
-            k64Cnt = key.Length / 8; // pre-padded ?
+            _k64Cnt = key.Length / 8; // pre-padded ?
             SetKey(key);
         }
 
@@ -68,17 +68,16 @@ public TwofishCipher(byte[] key, CipherMode mode, CipherPadding padding)
         /// </returns>
         public override int EncryptBlock(byte[] inputBuffer, int inputOffset, int inputCount, byte[] outputBuffer, int outputOffset)
         {
-            int x0 = BytesTo32Bits(inputBuffer, inputOffset) ^ gSubKeys[INPUT_WHITEN];
-            int x1 = BytesTo32Bits(inputBuffer, inputOffset + 4) ^ gSubKeys[INPUT_WHITEN + 1];
-            int x2 = BytesTo32Bits(inputBuffer, inputOffset + 8) ^ gSubKeys[INPUT_WHITEN + 2];
-            int x3 = BytesTo32Bits(inputBuffer, inputOffset + 12) ^ gSubKeys[INPUT_WHITEN + 3];
-
-            int k = ROUND_SUBKEYS;
-            int t0, t1;
-            for (int r = 0; r < ROUNDS; r += 2)
+            var x0 = BytesTo32Bits(inputBuffer, inputOffset) ^ gSubKeys[INPUT_WHITEN];
+            var x1 = BytesTo32Bits(inputBuffer, inputOffset + 4) ^ gSubKeys[INPUT_WHITEN + 1];
+            var x2 = BytesTo32Bits(inputBuffer, inputOffset + 8) ^ gSubKeys[INPUT_WHITEN + 2];
+            var x3 = BytesTo32Bits(inputBuffer, inputOffset + 12) ^ gSubKeys[INPUT_WHITEN + 3];
+
+            var k = ROUND_SUBKEYS;
+            for (var r = 0; r < ROUNDS; r += 2)
             {
-                t0 = Fe32_0(gSBox, x0);
-                t1 = Fe32_3(gSBox, x1);
+                var t0 = Fe32_0(gSBox, x0);
+                var t1 = Fe32_3(gSBox, x1);
                 x2 ^= t0 + t1 + gSubKeys[k++];
                 x2 = (int)((uint)x2 >> 1) | x2 << 31;
                 x3 = (x3 << 1 | (int)((uint)x3 >> 31)) ^ (t0 + 2 * t1 + gSubKeys[k++]);
@@ -345,7 +344,7 @@ public override int DecryptBlock(byte[] inputBuffer, int inputOffset, int inputC
         private int[] gSubKeys;
         private int[] gSBox;
 
-        private int k64Cnt;
+        private readonly int _k64Cnt;
 
         private void SetKey(byte[] key)
         {
@@ -355,12 +354,12 @@ private void SetKey(byte[] key)
             var sBoxKeys = new int[MAX_KEY_BITS / 64]; // 4
             gSubKeys = new int[TOTAL_SUBKEYS];
 
-            if (k64Cnt < 1)
+            if (_k64Cnt < 1)
             {
                 throw new ArgumentException("Key size less than 64 bits");
             }
 
-            if (k64Cnt > 4)
+            if (_k64Cnt > 4)
             {
                 throw new ArgumentException("Key size larger than 256 bits");
             }
@@ -371,26 +370,26 @@ private void SetKey(byte[] key)
             * maximum of 32 bytes ( 256 bits ), so the range
             * for k64Cnt is 1..4
             */
-            for (int i = 0; i < k64Cnt; i++)
+            for (var i = 0; i < _k64Cnt; i++)
             {
                 var p = i * 8;
 
                 k32e[i] = BytesTo32Bits(key, p);
                 k32o[i] = BytesTo32Bits(key, p + 4);
 
-                sBoxKeys[k64Cnt - 1 - i] = RS_MDS_Encode(k32e[i], k32o[i]);
+                sBoxKeys[_k64Cnt - 1 - i] = RS_MDS_Encode(k32e[i], k32o[i]);
             }
 
-            for (int i = 0; i < TOTAL_SUBKEYS / 2; i++)
+            for (var i = 0; i < TOTAL_SUBKEYS / 2; i++)
             {
                 var q = i * SK_STEP;
-                var A = F32(q, k32e);
-                var B = F32(q + SK_BUMP, k32o);
-                B = B << 8 | (int)((uint)B >> 24);
-                A += B;
-                gSubKeys[i * 2] = A;
-                A += B;
-                gSubKeys[i * 2 + 1] = A << SK_ROTL | (int)((uint)A >> (32 - SK_ROTL));
+                var a = F32(q, k32e);
+                var b = F32(q + SK_BUMP, k32o);
+                b = b << 8 | (int)((uint)b >> 24);
+                a += b;
+                gSubKeys[i * 2] = a;
+                a += b;
+                gSubKeys[i * 2 + 1] = a << SK_ROTL | (int)((uint)a >> (32 - SK_ROTL));
             }
 
             /*
@@ -405,7 +404,7 @@ private void SetKey(byte[] key)
             {
                 int b1, b2, b3;
                 var b0 = b1 = b2 = b3 = i;
-                switch (k64Cnt & 3)
+                switch (_k64Cnt & 3)
                 {
                     case 1:
                         gSBox[i * 2] = gMDS0[(P[P_01 * 256 + b0] & 0xff) ^ M_b0(k0)];
@@ -447,17 +446,17 @@ private void SetKey(byte[] key)
         */
         private int F32(int x, int[] k32)
         {
-            int b0 = M_b0(x);
-            int b1 = M_b1(x);
-            int b2 = M_b2(x);
-            int b3 = M_b3(x);
-            int k0 = k32[0];
-            int k1 = k32[1];
-            int k2 = k32[2];
-            int k3 = k32[3];
-
-            int result = 0;
-            switch (k64Cnt & 3)
+            var b0 = M_b0(x);
+            var b1 = M_b1(x);
+            var b2 = M_b2(x);
+            var b3 = M_b3(x);
+            var k0 = k32[0];
+            var k1 = k32[1];
+            var k2 = k32[2];
+            var k3 = k32[3];
+
+            var result = 0;
+            switch (_k64Cnt & 3)
             {
                 case 1:
                     result = gMDS0[(P[P_01 * 256 + b0] & 0xff) ^ M_b0(k0)] ^
@@ -499,7 +498,7 @@ private int F32(int x, int[] k32)
         */
         private static int RS_MDS_Encode(int k0, int k1)
         {
-            int r = k1;
+            var r = k1;
             // shift 1 byte at a time
             r = RS_rem(r);
             r = RS_rem(r);
@@ -525,10 +524,10 @@ private static int RS_MDS_Encode(int k0, int k1)
         */
         private static int RS_rem(int x)
         {
-            int b = (int)(((uint)x >> 24) & 0xff);
-            int g2 = ((b << 1) ^
+            var b = (int)(((uint)x >> 24) & 0xff);
+            var g2 = ((b << 1) ^
                     ((b & 0x80) != 0 ? RS_GF_FDBK : 0)) & 0xff;
-            int g3 = ((int)((uint)b >> 1) ^
+            var g3 = ((int)((uint)b >> 1) ^
                     ((b & 0x01) != 0 ? (int)((uint)RS_GF_FDBK >> 1) : 0)) ^ g2;
             return ((x << 8) ^ (g3 << 24) ^ (g2 << 16) ^ (g3 << 8) ^ b);
         }

src/Renci.SshNet/Security/Cryptography/Key.cs

@@ -46,7 +46,7 @@ protected Key(byte[] data)
                 throw new ArgumentNullException("data");
 
             var der = new DerData(data);
-            var version = der.ReadBigInteger();
+            der.ReadBigInteger(); // skip version
 
             var keys = new List<BigInteger>();
             while (!der.IsEndOfData)

src/Renci.SshNet/Sftp/SftpFileSystemInformation.cs

@@ -8,7 +8,7 @@ public class SftpFileSytemInformation
         internal const ulong SSH_FXE_STATVFS_ST_RDONLY = 0x1;
         internal const ulong SSH_FXE_STATVFS_ST_NOSUID = 0x2;
 
-        private ulong _flag;
+        private readonly ulong _flag;
 
         /// <summary>
         /// Gets the file system block size.