Replace for(;;) with for-in

CryptoSwiftTests/ChaCha20Tests.swift

@@ -42,9 +42,8 @@ final class ChaCha20Tests: XCTestCase {
             "EF3FDFD6C61578FBF5CF35BD3DD33B8009631634D21E42AC33960BD138E50D32111E4CAF237EE53CA8AD6426194A88545DDC497A0B466E7D6BBDB0041B2F586B",
             "F798A189F195E66982105FFB640BB7757F579DA31602FC93EC01AC56F85AC3C134A4547B733B46413042C9440049176905D3BE59EA1C53F15916155C2BE8241A38008B9A26BC35941E2444177C8ADE6689DE95264986D95889FB60E84629C9BD9A5ACB1CC118BE563EB9B3A4A472F82E09A7E778492B562EF7130E88DFE031C79DB9D4F7C7A899151B9A475032B63FC385245FE054E3DD5A97A5F576FE064025D3CE042C566AB2C507B138DB853E3D6959660996546CC9C4A6EAFDC777C040D70EAF46F76DAD3979E5C5360C3317166A1C894C94A371876A94DF7628FE4EAAF2CCB27D5AAAE0AD7AD0F9D4B6AD3B54098746D4524D38407A6DEB3AB78FAB78C9"
         ]
-        
-        for (var idx = 0; idx < keys.count; idx++) {
-            
+
+        for idx in 0..<keys.count {            
             let expectedHex = expectedHexes[idx]
             let message = [UInt8](count: (expectedHex.characters.count / 2), repeatedValue: 0)
             

Sources/CryptoSwift/AES.swift

@@ -297,7 +297,8 @@ final public class AES {
         }
         
         var tmp:[UInt8]
-        for (var i = variant.Nk; i < variant.Nb * (variant.Nr + 1); i++) {
+
+        for i in variant.Nk..<variant.Nb * (variant.Nr + 1) {
             tmp = [UInt8](count: 4, repeatedValue: 0)
             
             for wordIdx in 0..<4 {

Sources/CryptoSwift/ChaCha20.swift

@@ -20,7 +20,7 @@ final public class ChaCha20 {
         var input:[UInt32] = [UInt32](count: 16, repeatedValue: 0)
         
         deinit {
-            for (var i = 0; i < input.count; i++) {
+            for i in 0..<input.count {
                 input[i] = 0x00;
             }
         }
@@ -89,7 +89,7 @@ final public class ChaCha20 {
         }
         
         // 4 - 8
-        for (var i = 0; i < 4; i++) {
+        for i in 0..<4 {
             let start = i * 4
             ctx.input[i + 4] = wordNumber(key[start..<(start + 4)])
         }
@@ -113,7 +113,7 @@ final public class ChaCha20 {
         }
         
         // 8 - 11
-        for (var i = 0; i < 4; i++) {
+        for i in 0..<4 {
             let start = addPos + (i*4)
             
             let bytes = key[start..<(start + 4)]
@@ -149,12 +149,12 @@ final public class ChaCha20 {
                     /* stopping at 2^70 bytes per nonce is user's responsibility */
                 }
                 if (bytes <= ChaCha20.blockSize) {
-                    for (var i = 0; i < bytes; i++) {
+                    for i in 0..<bytes {
                         c[i + cPos] = message[i + mPos] ^ output[i]
                     }
                     return c
                 }
-                for (var i = 0; i < ChaCha20.blockSize; i++) {
+                for i in 0..<ChaCha20.blockSize {
                     c[i + cPos] = message[i + mPos] ^ output[i]
                 }
                 bytes -= ChaCha20.blockSize
@@ -196,9 +196,10 @@ extension ChaCha20: Cipher {
 /// Change array to number. It's here because arrayOfBytes is too slow
 private func wordNumber(bytes:ArraySlice<UInt8>) -> UInt32 {
     var value:UInt32 = 0
-    for (var i:UInt32 = 0, j = bytes.startIndex; i < 4; i++, j++) {
+    for i:UInt32 in 0..<4 {
+        let j = bytes.startIndex + Int(i)
         value = value | UInt32(bytes[j]) << (8 * i)
     }
-    return value
-}
+
+    return value}
 

Sources/CryptoSwift/Cipher.swift

@@ -27,7 +27,7 @@ public protocol Cipher {
 extension Cipher {
     static public func randomIV(blockSize:Int) -> [UInt8] {
         var randomIV:[UInt8] = [UInt8]();
-        for (var i = 0; i < blockSize; i++) {
+        for _ in 0..<blockSize {
             randomIV.append(UInt8(truncatingBitPattern: cs_arc4random_uniform(256)));
         }
         return randomIV

Sources/CryptoSwift/Foundation/NSData+Extension.swift

@@ -23,7 +23,7 @@ extension NSData {
     public func checksum() -> UInt16 {
         var s:UInt32 = 0
         var bytesArray = self.arrayOfBytes()
-        for (var i = 0; i < bytesArray.count; i++) {
+        for i in 0..<bytesArray.count {
             s = s + UInt32(bytesArray[i])
         }
         s = s % 65536

Sources/CryptoSwift/Poly1305.swift

@@ -164,10 +164,9 @@ final public class Poly1305 {
         
         /* process the remaining block */
         if (context.leftover > 0) {
-            
-            var i = context.leftover
-            context.buffer[i++] = 1
-            for (; i < blockSize; i++) {
+
+            context.buffer[context.leftover] = 1
+            for i in (context.leftover + 1)..<blockSize {
                 context.buffer[i] = 0
             }
             context.final = 1