use indices in place of enumerated() where it make sense

CryptoSwiftTests/Helpers.swift

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Marcin Krzyzanowski. All rights reserved.
 //
 
-func compareMatrix(a:[Array<UInt8>], b:[Array<UInt8>]) -> Bool {
+func compareMatrix(a:Array<Array<UInt8>>, b:Array<Array<UInt8>>) -> Bool {
     for (i,arr) in a.enumerated() {
         for (j,val) in arr.enumerated() {
             if (val != b[i][j]) {

Sources/CryptoSwift/AES.swift

@@ -487,8 +487,8 @@ extension AES: Cipher {
         var oneTimeCryptor = self.makeEncryptor()
         var out = Array<UInt8>()
         out.reserveCapacity(bytes.count)
-        for (idx, block) in chunks.enumerated() {
-            out += try oneTimeCryptor.update(withBytes: block, isLast: idx == max(0,chunks.count - 1))
+        for idx in chunks.indices {
+            out += try oneTimeCryptor.update(withBytes: chunks[idx], isLast: idx == chunks.endIndex)
         }
 
         if blockMode.options.contains(.PaddingRequired) && (out.count % AES.blockSize != 0) {
@@ -507,8 +507,8 @@ extension AES: Cipher {
         let chunks = bytes.chunks(chunksize: AES.blockSize)
         var out = Array<UInt8>()
         out.reserveCapacity(bytes.count)
-        for (idx,chunk) in chunks.enumerated() {
-            out += try oneTimeCryptor.update(withBytes: chunk, isLast: idx == max(0,chunks.count - 1))
+        for idx in chunks.indices {
+            out += try oneTimeCryptor.update(withBytes: chunks[idx], isLast: idx == chunks.endIndex)
         }
         return out
     }

Sources/CryptoSwift/Generics.swift

@@ -20,11 +20,11 @@ extension UInt32:Initiable {}
 extension UInt64:Initiable {}
 
 /** build bit pattern from array of bits */
-func integerFrom<T: UnsignedInteger>(bits: [Bit]) -> T
+func integerFrom<T: UnsignedInteger>(bits: Array<Bit>) -> T
 {
     var bitPattern:T = 0
-    for (idx,b) in bits.enumerated() {
-        if (b == Bit.One) {
+    for idx in bits.indices {
+        if bits[idx] == Bit.One {
             let bit = T(UIntMax(1) << UIntMax(idx))
             bitPattern = bitPattern | bit
         }

Sources/CryptoSwift/HMAC.swift

@@ -69,11 +69,11 @@ final public class HMAC {
 
     public func authenticate(bytes:Array<UInt8>) -> Array<UInt8>? {
         var opad = Array<UInt8>(repeating: 0x5c, count: variant.blockSize())
-        for (idx, _) in key.enumerated() {
+        for idx in key.indices {
             opad[idx] = key[idx] ^ opad[idx]
         }
         var ipad = Array<UInt8>(repeating: 0x36, count: variant.blockSize())
-        for (idx, _) in key.enumerated() {
+        for idx in key.indices {
             ipad[idx] = key[idx] ^ ipad[idx]
         }
 

Sources/CryptoSwift/UInt8Extension.swift

@@ -71,9 +71,9 @@ extension UInt8 {
     func bits() -> String {
         var s = String()
         let arr:[Bit] = self.bits()
-        for (idx,b) in arr.enumerated() {
-            s += (b == Bit.One ? "1" : "0")
-            if ((idx + 1) % 8 == 0) { s += " " }
+        for idx in arr.indices {
+            s += (arr[idx] == Bit.One ? "1" : "0")
+            if (idx.advanced(by: 1) % 8 == 0) { s += " " }
         }
         return s
     }