Apply SwiftFormat

Package.swift

@@ -2,7 +2,7 @@
 
 import PackageDescription
 
-_ = Package(name: "CryptoSwift", 
+_ = Package(name: "CryptoSwift",
             products: [.library(name: "CryptoSwift", targets: ["CryptoSwift"])],
             targets: [
                 .target(name: "CryptoSwift"),

Sources/CryptoSwift/AES.Cryptors.swift

@@ -14,6 +14,7 @@
 //
 
 // MARK: Cryptors
+
 extension AES: Cryptors {
     public func makeEncryptor() throws -> AES.Encryptor {
         return try AES.Encryptor(aes: self)
@@ -25,6 +26,7 @@ extension AES: Cryptors {
 }
 
 // MARK: Encryptor
+
 extension AES {
     public struct Encryptor: Updatable {
         private var worker: BlockModeWorker
@@ -62,8 +64,8 @@ extension AES {
 }
 
 // MARK: Decryptor
-extension AES {
 
+extension AES {
     public struct Decryptor: RandomAccessCryptor {
         private var worker: BlockModeWorker
         private let padding: Padding

Sources/CryptoSwift/AES.swift

@@ -18,7 +18,6 @@
 
 /// The Advanced Encryption Standard (AES)
 public final class AES: BlockCipher {
-
     public enum Error: Swift.Error {
         /// Data padding is required
         case dataPaddingRequired
@@ -354,7 +353,6 @@ private extension AES {
     }
 
     private func expandKey(_ key: Key, variant _: Variant) -> Array<Array<UInt32>> {
-
         func convertExpandedKey(_ expanded: Array<UInt8>) -> Array<Array<UInt32>> {
             return expanded.batched(by: 4).map({ UInt32(bytes: $0.reversed()) }).batched(by: 4).map({ Array($0) })
         }
@@ -485,8 +483,8 @@ private extension AES {
 }
 
 // MARK: Cipher
-extension AES: Cipher {
 
+extension AES: Cipher {
     public func encrypt(_ bytes: ArraySlice<UInt8>) throws -> Array<UInt8> {
         let chunks = bytes.batched(by: AES.blockSize)
 

Sources/CryptoSwift/Array+Extension.swift

@@ -14,7 +14,6 @@
 //
 
 extension Array {
-
     public init(reserveCapacity: Int) {
         self = Array<Element>()
         self.reserveCapacity(reserveCapacity)
@@ -23,11 +22,9 @@ extension Array {
     var slice: ArraySlice<Element> {
         return self[self.startIndex..<self.endIndex]
     }
-
 }
 
 extension Array where Element == UInt8 {
-
     public init(hex: String) {
         self.init(reserveCapacity: hex.unicodeScalars.lazy.underestimatedCount)
         var buffer: UInt8?
@@ -78,7 +75,6 @@ extension Array where Element == UInt8 {
 }
 
 extension Array where Element == UInt8 {
-
     /// split in chunks with given chunk size
     @available(*, deprecated: 0.8.0, message: "")
     public func chunks(size chunksize: Int) -> Array<Array<Element>> {

Sources/CryptoSwift/BatchedCollection.swift

@@ -18,7 +18,7 @@ struct BatchedCollectionIndex<Base: Collection> {
 }
 
 extension BatchedCollectionIndex: Comparable {
-    static func ==<Base>(lhs: BatchedCollectionIndex<Base>, rhs: BatchedCollectionIndex<Base>) -> Bool {
+    static func == <Base>(lhs: BatchedCollectionIndex<Base>, rhs: BatchedCollectionIndex<Base>) -> Bool {
         return lhs.range.lowerBound == rhs.range.lowerBound
     }
 

Sources/CryptoSwift/Bit.swift

@@ -19,7 +19,6 @@ public enum Bit: Int {
 }
 
 extension Bit {
-
     func inverted() -> Bit {
         return self == .zero ? .one : .zero
     }

Sources/CryptoSwift/Blowfish.swift

@@ -18,7 +18,6 @@
 //
 
 public final class Blowfish {
-
     public enum Error: Swift.Error {
         /// Data padding is required
         case dataPaddingRequired
@@ -490,13 +489,11 @@ public final class Blowfish {
 }
 
 extension Blowfish: Cipher {
-
     /// Encrypt the 8-byte padded buffer, block by block. Note that for amounts of data larger than a block, it is not safe to just call encrypt() on successive blocks.
     ///
     /// - Parameter bytes: Plaintext data
     /// - Returns: Encrypted data
     public func encrypt<C: Collection>(_ bytes: C) throws -> Array<UInt8> where C.Element == UInt8, C.Index == Int {
-
         let bytes = padding.add(to: Array(bytes), blockSize: Blowfish.blockSize) // FIXME: Array(bytes) copies
 
         var out = Array<UInt8>()
@@ -518,7 +515,6 @@ extension Blowfish: Cipher {
     /// - Parameter bytes: Ciphertext data
     /// - Returns: Plaintext data
     public func decrypt<C: Collection>(_ bytes: C) throws -> Array<UInt8> where C.Element == UInt8, C.Index == Int {
-
         if blockMode.options.contains(.paddingRequired) && (bytes.count % Blowfish.blockSize != 0) {
             throw Error.dataPaddingRequired
         }

Sources/CryptoSwift/CMAC.swift

@@ -14,7 +14,6 @@
 //
 
 public final class CMAC: Authenticator {
-    
     public enum Error: Swift.Error {
         case wrongKeyLength
     }
@@ -36,7 +35,7 @@ public final class CMAC: Authenticator {
 
     public func authenticate(_ bytes: Array<UInt8>) throws -> Array<UInt8> {
         let aes = try AES(key: Array(key), blockMode: .CBC(iv: CMAC.Zero), padding: .noPadding)
-        
+
         let l = try aes.encrypt(CMAC.Zero)
         var subKey1 = leftShiftOneBit(l)
         if (l[0] & 0x80) != 0 {
@@ -58,7 +57,7 @@ public final class CMAC: Authenticator {
         if !lastBlockComplete {
             bitPadding(to: &paddedBytes, blockSize: CMAC.BlockSize)
         }
-        
+
         var blocks = Array(paddedBytes.batched(by: CMAC.BlockSize))
         var lastBlock = blocks.popLast()!
         if lastBlockComplete {
@@ -66,7 +65,7 @@ public final class CMAC: Authenticator {
         } else {
             lastBlock = xor(lastBlock, subKey2)
         }
-        
+
         var x = Array<UInt8>(repeating: 0x00, count: CMAC.BlockSize)
         var y = Array<UInt8>(repeating: 0x00, count: CMAC.BlockSize)
         for block in blocks {
@@ -78,11 +77,11 @@ public final class CMAC: Authenticator {
     }
 
     // MARK: Helper methods
-    
+
     /**
      Performs left shift by one bit to the bit string aquired after concatenating al bytes in the byte array
      - parameters:
-       - bytes: byte array
+     - bytes: byte array
      - returns: bit shifted bit string split again in array of bytes
      */
     private func leftShiftOneBit(_ bytes: Array<UInt8>) -> Array<UInt8> {

Sources/CryptoSwift/ChaCha20.swift

@@ -17,7 +17,6 @@
 //
 
 public final class ChaCha20: BlockCipher {
-
     public enum Error: Swift.Error {
         case invalidKeyOrInitializationVector
     }
@@ -222,7 +221,7 @@ public final class ChaCha20: BlockCipher {
             var u: UInt32 = 1
             for i in 0..<4 {
                 u += UInt32(counter[i])
-                counter[i] = UInt8(u & 0xFF)
+                counter[i] = UInt8(u & 0xff)
                 u >>= 8
             }
             bytesSlice = bytesSlice[bytesSlice.startIndex + ChaCha20.blockSize..<bytesSlice.endIndex]
@@ -239,8 +238,8 @@ public final class ChaCha20: BlockCipher {
 }
 
 // MARK: Cipher
-extension ChaCha20: Cipher {
 
+extension ChaCha20: Cipher {
     public func encrypt(_ bytes: ArraySlice<UInt8>) throws -> Array<UInt8> {
         return process(bytes: bytes, counter: &counter, key: Array(key))
     }
@@ -251,8 +250,8 @@ extension ChaCha20: Cipher {
 }
 
 // MARK: Encryptor
-extension ChaCha20 {
 
+extension ChaCha20 {
     public struct Encryptor: Updatable {
         private var accumulated = Array<UInt8>()
         private let chacha: ChaCha20
@@ -278,8 +277,8 @@ extension ChaCha20 {
 }
 
 // MARK: Decryptor
-extension ChaCha20 {
 
+extension ChaCha20 {
     public struct Decryptor: Updatable {
         private var accumulated = Array<UInt8>()
 
@@ -323,8 +322,8 @@ extension ChaCha20 {
 }
 
 // MARK: Cryptors
-extension ChaCha20: Cryptors {
 
+extension ChaCha20: Cryptors {
     public func makeEncryptor() -> ChaCha20.Encryptor {
         return Encryptor(chacha: self)
     }

Sources/CryptoSwift/ChaCha20Poly1305.swift

@@ -17,38 +17,35 @@
 //  https://tools.ietf.org/html/rfc7539#section-2.8.1
 
 public final class ChaCha20Poly1305: AEAD {
-
-    public static func encrypt( message:Array<UInt8>, header:Array<UInt8>, key:Array<UInt8>, nonce:Array<UInt8> ) throws -> (cipher:Array<UInt8>, tag:Array<UInt8>) {
-        
+    public static func encrypt(message: Array<UInt8>, header: Array<UInt8>, key: Array<UInt8>, nonce: Array<UInt8>) throws -> (cipher: Array<UInt8>, tag: Array<UInt8>) {
         let chacha = try ChaCha20(key: key, iv: nonce)
-        
+
         var polykey = Array<UInt8>(repeating: 0, count: 32)
         var toEncrypt = Array<UInt8>(reserveCapacity: message.count + 64)
-        
+
         toEncrypt += polykey
         polykey = try chacha.encrypt(polykey)
         toEncrypt += polykey
         toEncrypt += message
-        
+
         let fullCipher = try chacha.encrypt(toEncrypt)
         let cipher = Array(fullCipher.dropFirst(64))
-        
+
         let tag = try ChaCha20Poly1305.calculateTag(cipher: cipher, header: header, encodedKey: polykey)
-        
+
         return (cipher, tag)
     }
-    
-    public static func decrypt( cipher:Array<UInt8>, header:Array<UInt8>, key:Array<UInt8>, nonce:Array<UInt8>, tag:Array<UInt8> ) throws -> (message:Array<UInt8>, success:Bool) {
-        
+
+    public static func decrypt(cipher: Array<UInt8>, header: Array<UInt8>, key: Array<UInt8>, nonce: Array<UInt8>, tag: Array<UInt8>) throws -> (message: Array<UInt8>, success: Bool) {
         let chacha = try ChaCha20(key: key, iv: nonce)
-        
+
         var polykey = Array<UInt8>(repeating: 0, count: 32)
         polykey = try chacha.encrypt(polykey)
-        
+
         let mac = try ChaCha20Poly1305.calculateTag(cipher: cipher, header: header, encodedKey: polykey)
-        
+
         guard mac == tag else { return (cipher, false) }
-        
+
         var toDecrypt = Array<UInt8>(reserveCapacity: cipher.count + 64)
         toDecrypt += polykey
         toDecrypt += polykey
@@ -57,9 +54,8 @@ public final class ChaCha20Poly1305: AEAD {
         let message = Array(decrypted.dropFirst(64))
         return (message, true)
     }
-    
-    private class func calculateTag( cipher:Array<UInt8>, header:Array<UInt8>, encodedKey:Array<UInt8> ) throws -> Array<UInt8> {
-        
+
+    private class func calculateTag(cipher: Array<UInt8>, header: Array<UInt8>, encodedKey: Array<UInt8>) throws -> Array<UInt8> {
         let poly1305 = Poly1305(key: encodedKey)
         var mac = Array<UInt8>()
         mac += header
@@ -70,8 +66,7 @@ public final class ChaCha20Poly1305: AEAD {
         mac += Array<UInt8>(repeating: 0, count: cipherPadding)
         mac += UInt64(bigEndian: UInt64(header.count)).bytes()
         mac += UInt64(bigEndian: UInt64(cipher.count)).bytes()
-        
+
         return try poly1305.authenticate(mac)
     }
-    
 }

Sources/CryptoSwift/Checksum.swift

@@ -108,8 +108,8 @@ public final class Checksum {
 }
 
 // MARK: Public interface
-public extension Checksum {
 
+public extension Checksum {
     /// Calculate CRC32
     ///
     /// - parameter message: Message

Sources/CryptoSwift/Collection+Extension.swift

@@ -13,7 +13,6 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 extension Collection where Self.Element == UInt8, Self.Index == Int {
-
     // Big endian order
     func toUInt32Array() -> Array<UInt32> {
         if isEmpty {

Sources/CryptoSwift/CompactMap.swift

@@ -13,11 +13,11 @@
 //
 
 #if swift(>=4.1)
-// TODO: remove this file when Xcode 9.2 is no longer used
+    // TODO: remove this file when Xcode 9.2 is no longer used
 #else
-extension Sequence {
-    public func compactMap<ElementOfResult>(_ transform: (Element) throws -> ElementOfResult?) rethrows -> [ElementOfResult] {
-        return try flatMap(transform)
+    extension Sequence {
+        public func compactMap<ElementOfResult>(_ transform: (Element) throws -> ElementOfResult?) rethrows -> [ElementOfResult] {
+            return try flatMap(transform)
+        }
     }
-}
 #endif

Sources/CryptoSwift/Cryptors.swift

@@ -35,7 +35,6 @@ public protocol Cryptors: class {
 }
 
 extension Cryptors {
-
     public static func randomIV(_ blockSize: Int) -> Array<UInt8> {
         var randomIV: Array<UInt8> = Array<UInt8>()
         randomIV.reserveCapacity(blockSize)

Sources/CryptoSwift/Digest.swift

@@ -18,7 +18,6 @@ public typealias Hash = Digest
 
 /// Hash functions to calculate Digest.
 public struct Digest {
-
     /// Calculate MD5 Digest
     /// - parameter bytes: input message
     /// - returns: Digest bytes

Sources/CryptoSwift/Foundation/AES+Foundation.swift

@@ -16,7 +16,6 @@
 import Foundation
 
 extension AES {
-
     /// Initialize with CBC block mode.
     public convenience init(key: String, iv: String, padding: Padding = .pkcs7) throws {
         try self.init(key: key.bytes, blockMode: .CBC(iv: iv.bytes), padding: padding)

Sources/CryptoSwift/Foundation/Array+Foundation.swift

@@ -16,7 +16,6 @@
 import Foundation
 
 public extension Array where Element == UInt8 {
-
     public func toBase64() -> String? {
         return Data(bytes: self).base64EncodedString()
     }

Sources/CryptoSwift/Foundation/Blowfish+Foundation.swift

@@ -16,7 +16,6 @@
 import Foundation
 
 extension Blowfish {
-
     /// Initialize with CBC block mode.
     public convenience init(key: String, iv: String, padding: Padding = .pkcs7) throws {
         try self.init(key: key.bytes, blockMode: .CBC(iv: iv.bytes), padding: padding)

Sources/CryptoSwift/Foundation/ChaCha20+Foundation.swift

@@ -16,7 +16,6 @@
 import Foundation
 
 extension ChaCha20 {
-
     public convenience init(key: String, iv: String) throws {
         try self.init(key: key.bytes, iv: iv.bytes)
     }

Sources/CryptoSwift/Foundation/Data+Extension.swift

@@ -16,7 +16,6 @@
 import Foundation
 
 extension Data {
-
     /// Two octet checksum as defined in RFC-4880. Sum of all octets, mod 65536
     public func checksum() -> UInt16 {
         var s: UInt32 = 0
@@ -78,7 +77,6 @@ extension Data {
 }
 
 extension Data {
-
     public init(hex: String) {
         self.init(bytes: Array<UInt8>(hex: hex))
     }

Sources/CryptoSwift/Foundation/HMAC+Foundation.swift

@@ -16,7 +16,6 @@
 import Foundation
 
 extension HMAC {
-
     public convenience init(key: String, variant: HMAC.Variant = .md5) throws {
         self.init(key: key.bytes, variant: variant)
     }

Sources/CryptoSwift/Foundation/Rabbit+Foundation.swift

@@ -16,7 +16,6 @@
 import Foundation
 
 extension Rabbit {
-
     public convenience init(key: String) throws {
         try self.init(key: key.bytes)
     }

Sources/CryptoSwift/Foundation/String+FoundationExtension.swift

@@ -16,7 +16,6 @@
 import Foundation
 
 extension String {
-
     /// Return Base64 back to String
     public func decryptBase64ToString(cipher: Cipher) throws -> String {
         guard let decodedData = Data(base64Encoded: self, options: []) else {

Sources/CryptoSwift/HKDF.swift

@@ -21,23 +21,22 @@
 #else
     import Darwin
 #endif
-    
+
 /// A key derivation function.
 ///
 /// HKDF   - HMAC-based Extract-and-Expand Key Derivation Function.
 public struct HKDF {
-    
     public enum Error: Swift.Error {
         case invalidInput
         case derivedKeyTooLong
     }
-    
+
     private let numBlocks: Int // l
     private let dkLen: Int
     private let info: Array<UInt8>
     fileprivate let prk: Array<UInt8>
     fileprivate let variant: HMAC.Variant
-    
+
     /// - parameters:
     ///   - variant: hash variant
     ///   - salt: optional salt (if not provided, it is set to a sequence of variant.digestLength zeros)
@@ -47,7 +46,7 @@ public struct HKDF {
         guard !password.isEmpty else {
             throw Error.invalidInput
         }
-        
+
         let dkLen = keyLength ?? variant.digestLength
         let keyLengthFinal = Double(dkLen)
         let hLen = Double(variant.digestLength)
@@ -55,32 +54,31 @@ public struct HKDF {
         guard numBlocks <= 255 else {
             throw Error.derivedKeyTooLong
         }
-        
+
         /// HKDF-Extract(salt, password) -> PRK
         ///  - PRK - a pseudo-random key; it is used by calculate()
-        self.prk = try HMAC(key: salt ?? [], variant: variant).authenticate(password)
+        prk = try HMAC(key: salt ?? [], variant: variant).authenticate(password)
         self.info = info ?? []
         self.variant = variant
         self.dkLen = dkLen
         self.numBlocks = numBlocks
     }
-    
+
     public func calculate() throws -> Array<UInt8> {
-        let hmac = HMAC(key: self.prk, variant: self.variant)
+        let hmac = HMAC(key: prk, variant: variant)
         var ret = Array<UInt8>()
-        ret.reserveCapacity(self.numBlocks * self.variant.digestLength)
+        ret.reserveCapacity(numBlocks * variant.digestLength)
         var value = Array<UInt8>()
-        for i in 1...self.numBlocks {
-            value.append(contentsOf: self.info)
+        for i in 1...numBlocks {
+            value.append(contentsOf: info)
             value.append(UInt8(i))
-            
+
             let bytes = try hmac.authenticate(value)
             ret.append(contentsOf: bytes)
-            
+
             /// update value to use it as input for next iteration
             value = bytes
         }
         return Array(ret.prefix(dkLen))
     }
 }
-

Sources/CryptoSwift/HMAC.swift

@@ -14,7 +14,6 @@
 //
 
 public final class HMAC: Authenticator {
-
     public enum Error: Swift.Error {
         case authenticateError
         case invalidInput

Sources/CryptoSwift/MD5.swift

@@ -122,7 +122,6 @@ public final class MD5: DigestType {
 }
 
 extension MD5: Updatable {
-
     public func update(withBytes bytes: ArraySlice<UInt8>, isLast: Bool = false) throws -> Array<UInt8> {
         accumulated += bytes
 

Sources/CryptoSwift/NoPadding.swift

@@ -14,7 +14,6 @@
 //
 
 struct NoPadding: PaddingProtocol {
-
     init() {
     }
 

Sources/CryptoSwift/PKCS/PBKDF1.swift

@@ -14,14 +14,12 @@
 //
 
 public extension PKCS5 {
-
     /// A key derivation function.
     ///
     /// PBKDF1 is recommended only for compatibility with existing
     /// applications since the keys it produces may not be large enough for
     /// some applications.
     public struct PBKDF1 {
-
         public enum Error: Swift.Error {
             case invalidInput
             case derivedKeyTooLong

Sources/CryptoSwift/PKCS/PBKDF2.swift

@@ -23,13 +23,11 @@
 #endif
 
 public extension PKCS5 {
-
     /// A key derivation function.
     ///
     /// PBKDF2 - Password-Based Key Derivation Function 2. Key stretching technique.
     ///          DK = PBKDF2(PRF, Password, Salt, c, dkLen)
     public struct PBKDF2 {
-
         public enum Error: Swift.Error {
             case invalidInput
             case derivedKeyTooLong
@@ -84,7 +82,6 @@ public extension PKCS5 {
 }
 
 fileprivate extension PKCS5.PBKDF2 {
-
     func ARR(_ i: Int) -> Array<UInt8> {
         var inti = Array<UInt8>(repeating: 0, count: 4)
         inti[0] = UInt8((i >> 24) & 0xff)

Sources/CryptoSwift/PKCS/PKCS7Padding.swift

@@ -18,7 +18,6 @@
 //
 
 struct PKCS7Padding: PaddingProtocol {
-
     enum Error: Swift.Error {
         case invalidPaddingValue
     }

Sources/CryptoSwift/Poly1305.swift

@@ -20,7 +20,6 @@
 ///  message such that an attacker has a negligible chance of producing a valid tag for an inauthentic message.
 
 public final class Poly1305: Authenticator {
-
     public enum Error: Swift.Error {
         case authenticateError
     }

Sources/CryptoSwift/Rabbit.swift

@@ -14,7 +14,6 @@
 //
 
 public final class Rabbit: BlockCipher {
-
     public enum Error: Swift.Error {
         case invalidKeyOrInitializationVector
     }
@@ -56,6 +55,7 @@ public final class Rabbit: BlockCipher {
     ]
 
     // MARK: - Initializers
+
     public convenience init(key: Array<UInt8>) throws {
         try self.init(key: key, iv: nil)
     }
@@ -70,6 +70,7 @@ public final class Rabbit: BlockCipher {
     }
 
     // MARK: -
+
     fileprivate func setup() {
         p7 = 0
 
@@ -183,8 +184,8 @@ public final class Rabbit: BlockCipher {
 }
 
 // MARK: Cipher
-extension Rabbit: Cipher {
 
+extension Rabbit: Cipher {
     public func encrypt(_ bytes: ArraySlice<UInt8>) throws -> Array<UInt8> {
         setup()
 

Sources/CryptoSwift/SHA1.swift

@@ -104,7 +104,6 @@ public final class SHA1: DigestType {
 }
 
 extension SHA1: Updatable {
-
     @discardableResult
     public func update(withBytes bytes: ArraySlice<UInt8>, isLast: Bool = false) throws -> Array<UInt8> {
         accumulated += bytes

Sources/CryptoSwift/SHA2.swift

@@ -280,7 +280,6 @@ public final class SHA2: DigestType {
 }
 
 extension SHA2: Updatable {
-
     public func update(withBytes bytes: ArraySlice<UInt8>, isLast: Bool = false) throws -> Array<UInt8> {
         accumulated += bytes
 

Sources/CryptoSwift/SHA3.swift

@@ -249,7 +249,6 @@ public final class SHA3: DigestType {
 }
 
 extension SHA3: Updatable {
-
     public func update(withBytes bytes: ArraySlice<UInt8>, isLast: Bool = false) throws -> Array<UInt8> {
         accumulated += bytes
 

Sources/CryptoSwift/String+Extension.swift

@@ -15,7 +15,6 @@
 
 /** String extension */
 extension String {
-
     public var bytes: Array<UInt8> {
         return data(using: String.Encoding.utf8, allowLossyConversion: true)?.bytes ?? Array(utf8)
     }

Sources/CryptoSwift/UInt16+Extension.swift

@@ -15,7 +15,6 @@
 
 /** array of bytes */
 extension UInt16 {
-
     @_specialize(exported: true, where T == ArraySlice<UInt8>)
     init<T: Collection>(bytes: T) where T.Element == UInt8, T.Index == Int {
         self = UInt16(bytes: bytes, fromIndex: bytes.startIndex)

Sources/CryptoSwift/UInt32+Extension.swift

@@ -24,7 +24,6 @@ extension UInt32: _UInt32Type {}
 
 /** array of bytes */
 extension UInt32 {
-
     @_specialize(exported: true, where T == ArraySlice<UInt8>)
     init<T: Collection>(bytes: T) where T.Element == UInt8, T.Index == Int {
         self = UInt32(bytes: bytes, fromIndex: bytes.startIndex)

Sources/CryptoSwift/UInt64+Extension.swift

@@ -15,7 +15,6 @@
 
 /** array of bytes */
 extension UInt64 {
-
     @_specialize(exported: true, where T == ArraySlice<UInt8>)
     init<T: Collection>(bytes: T) where T.Element == UInt8, T.Index == Int {
         self = UInt64(bytes: bytes, fromIndex: bytes.startIndex)

Sources/CryptoSwift/UInt8+Extension.swift

@@ -24,7 +24,6 @@ extension UInt8: _UInt8Type {}
 
 /** casting */
 extension UInt8 {
-
     /** cast because UInt8(<UInt32>) because std initializer crash if value is > byte */
     static func with(value: UInt64) -> UInt8 {
         let tmp = value & 0xff
@@ -44,7 +43,6 @@ extension UInt8 {
 
 /** Bits */
 extension UInt8 {
-
     init(bits: [Bit]) {
         self.init(integerFrom(bits) as UInt8)
     }

Sources/CryptoSwift/Updatable.swift

@@ -45,7 +45,6 @@ public protocol Updatable {
 }
 
 extension Updatable {
-
     public mutating func update(withBytes bytes: ArraySlice<UInt8>, isLast: Bool = false, output: (_ bytes: Array<UInt8>) -> Void) throws {
         let processed = try update(withBytes: bytes, isLast: isLast)
         if !processed.isEmpty {
@@ -76,7 +75,6 @@ extension Updatable {
 }
 
 extension Updatable {
-
     @discardableResult
     public mutating func update(withBytes bytes: Array<UInt8>, isLast: Bool = false) throws -> Array<UInt8> {
         return try update(withBytes: bytes.slice, isLast: isLast)

Sources/CryptoSwift/ZeroPadding.swift

@@ -16,7 +16,6 @@
 /// All the bytes that are required to be padded are padded with zero.
 /// Zero padding may not be reversible if the original file ends with one or more zero bytes.
 struct ZeroPadding: PaddingProtocol {
-
     init() {
     }
 

Tests/CryptoSwiftTests/AESTests.swift

@@ -13,9 +13,9 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
-import Foundation
 @testable import CryptoSwift
+import Foundation
+import XCTest
 
 final class AESTests: XCTestCase {
     // 128 bit key
@@ -366,7 +366,6 @@ final class AESTests: XCTestCase {
 #if !CI
 
     extension AESTests {
-
         func testAESEncryptPerformance() {
             let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
             let iv: Array<UInt8> = [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f]
@@ -390,7 +389,6 @@ final class AESTests: XCTestCase {
 #endif
 
 extension AESTests {
-
     static func allTests() -> [(String, (AESTests) -> () -> Void)] {
         var tests = [
             ("testAESEncrypt", testAESEncrypt),

Tests/CryptoSwiftTests/Access.swift

@@ -13,10 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
-import Foundation
 // import without @testable to test public API
 import CryptoSwift
+import Foundation
+import XCTest
 
 class Access: XCTestCase {
     let cipher = try! AES(key: "secret0key000000", iv: "0123456789012345")

Tests/CryptoSwiftTests/BlowfishTests.swift

@@ -15,11 +15,10 @@
 
 // Test vector from http://www.schneier.com/code/vectors.txt
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 class BlowfishTests: XCTestCase {
-
     struct TestData {
         let key: Array<UInt8>
         let input: Array<UInt8>
@@ -211,7 +210,6 @@ class BlowfishTests: XCTestCase {
 }
 
 extension BlowfishTests {
-
     static func allTests() -> [(String, (BlowfishTests) -> () -> Void)] {
         let tests = [
             ("testEncrypt", testEncrypt),

Tests/CryptoSwiftTests/CMACTests.swift

@@ -15,47 +15,46 @@
 
 // Test vectors from https://tools.ietf.org/html/rfc4493
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 final class CMACTests: XCTestCase {
-    
     func testMessageLength0() {
-            let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
-            let msg: Array<UInt8> = []
-            let expectedMac: Array<UInt8> = [0xbb, 0x1d, 0x69, 0x29, 0xe9, 0x59, 0x37, 0x28, 0x7f, 0xa3, 0x7d, 0x12, 0x9b, 0x75, 0x67, 0x46]
-        
-            let cmac = try! CMAC(key: key).authenticate(msg)
-            XCTAssertEqual(cmac, expectedMac, "Invalid authentication result")
+        let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
+        let msg: Array<UInt8> = []
+        let expectedMac: Array<UInt8> = [0xbb, 0x1d, 0x69, 0x29, 0xe9, 0x59, 0x37, 0x28, 0x7f, 0xa3, 0x7d, 0x12, 0x9b, 0x75, 0x67, 0x46]
+
+        let cmac = try! CMAC(key: key).authenticate(msg)
+        XCTAssertEqual(cmac, expectedMac, "Invalid authentication result")
     }
-    
+
     func testMessageLength16() {
-            let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
-            let msg: Array<UInt8> = [0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a]
-            let expectedMac: Array<UInt8> = [0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44, 0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c]
-        
-            let cmac = try! CMAC(key: key).authenticate(msg)
-            XCTAssertEqual(cmac, expectedMac, "Invalid authentication result")
+        let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
+        let msg: Array<UInt8> = [0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a]
+        let expectedMac: Array<UInt8> = [0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44, 0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c]
+
+        let cmac = try! CMAC(key: key).authenticate(msg)
+        XCTAssertEqual(cmac, expectedMac, "Invalid authentication result")
     }
-    
+
     func testMessageLength40() {
-            let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
-            let msg: Array<UInt8> = [0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11]
-            let expectedMac: Array<UInt8> = [0xdf, 0xa6, 0x67, 0x47, 0xde, 0x9a, 0xe6, 0x30, 0x30, 0xca, 0x32, 0x61, 0x14, 0x97, 0xc8, 0x27]
-        
-            let cmac = try! CMAC(key: key).authenticate(msg)
-            XCTAssertEqual(cmac, expectedMac, "Invalid authentication result")
+        let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
+        let msg: Array<UInt8> = [0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11]
+        let expectedMac: Array<UInt8> = [0xdf, 0xa6, 0x67, 0x47, 0xde, 0x9a, 0xe6, 0x30, 0x30, 0xca, 0x32, 0x61, 0x14, 0x97, 0xc8, 0x27]
+
+        let cmac = try! CMAC(key: key).authenticate(msg)
+        XCTAssertEqual(cmac, expectedMac, "Invalid authentication result")
     }
-    
+
     func testMessageLength64() {
-            let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
-            let msg: Array<UInt8> = [0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10]
-            let expectedMac: Array<UInt8> = [0x51, 0xf0, 0xbe, 0xbf, 0x7e, 0x3b, 0x9d, 0x92, 0xfc, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3c, 0xfe]
-        
-            let cmac = try! CMAC(key: key).authenticate(msg)
-            XCTAssertEqual(cmac, expectedMac, "Invalid authentication result")
+        let key: Array<UInt8> = [0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c]
+        let msg: Array<UInt8> = [0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10]
+        let expectedMac: Array<UInt8> = [0x51, 0xf0, 0xbe, 0xbf, 0x7e, 0x3b, 0x9d, 0x92, 0xfc, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3c, 0xfe]
+
+        let cmac = try! CMAC(key: key).authenticate(msg)
+        XCTAssertEqual(cmac, expectedMac, "Invalid authentication result")
     }
-    
+
     static let allTests = [
         ("testMessageLength0", testMessageLength0),
         ("testMessageLength16", testMessageLength16),

Tests/CryptoSwiftTests/ChaCha20Poly1305Tests.swift

@@ -16,68 +16,66 @@
 //
 //  https://tools.ietf.org/html/rfc7539#section-2.8.1
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 class ChaCha20Poly1305Tests: XCTestCase {
-    
     static let allTests = [
         ("testCCPoly1", test1),
         ("testCCPoly2", test2),
-        ("testCCPoly3", test3)
+        ("testCCPoly3", test3),
     ]
-    
+
     func test1() {
         executeTestCase("6b65792e6b65792e6b65792e6b65792e6b65792e6b65792e6b65792e6b65792e",
-               "6e6f6e63652e6e6f6e63652e",
-               "",
-               "6d657373616765",
-               "5d9c0a9fe7d5e5",
-               "c93aa61fc3cc66a819ac96f6ce365aee")
+                        "6e6f6e63652e6e6f6e63652e",
+                        "",
+                        "6d657373616765",
+                        "5d9c0a9fe7d5e5",
+                        "c93aa61fc3cc66a819ac96f6ce365aee")
     }
-    
+
     func test2() {
         /* Test vector from section 2.8.2. */
         executeTestCase("808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
-               "070000004041424344454647",
-               "50515253c0c1c2c3c4c5c6c7",
-               "4c616469657320616e642047656e746c656d656e206f662074686520636c617373206f66202739393a204966204920636f756c64206f6666657220796f75206f6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73637265656e20776f756c642062652069742e",
-               "d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d63dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b3692ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc3ff4def08e4b7a9de576d26586cec64b6116",
-               "1ae10b594f09e26a7e902ecbd0600691")
+                        "070000004041424344454647",
+                        "50515253c0c1c2c3c4c5c6c7",
+                        "4c616469657320616e642047656e746c656d656e206f662074686520636c617373206f66202739393a204966204920636f756c64206f6666657220796f75206f6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73637265656e20776f756c642062652069742e",
+                        "d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d63dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b3692ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc3ff4def08e4b7a9de576d26586cec64b6116",
+                        "1ae10b594f09e26a7e902ecbd0600691")
     }
-    
+
     func test3() {
         /* Test vector from A.5. */
         executeTestCase("1c9240a5eb55d38af333888604f6b5f0473917c1402b80099dca5cbc207075c0",
-               "000000000102030405060708",
-               "f33388860000000000004e91",
-               "496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67726573732e2fe2809d",
-               "64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb24c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c8559797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523eaf4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a1049e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c29a6ad5cb4022b02709b",
-               "eead9d67890cbb22392336fea1851f38")
+                        "000000000102030405060708",
+                        "f33388860000000000004e91",
+                        "496e7465726e65742d4472616674732061726520647261667420646f63756d656e74732076616c696420666f722061206d6178696d756d206f6620736978206d6f6e74687320616e64206d617920626520757064617465642c207265706c616365642c206f72206f62736f6c65746564206279206f7468657220646f63756d656e747320617420616e792074696d652e20497420697320696e617070726f70726961746520746f2075736520496e7465726e65742d447261667473206173207265666572656e6365206d6174657269616c206f7220746f2063697465207468656d206f74686572207468616e206173202fe2809c776f726b20696e2070726f67726573732e2fe2809d",
+                        "64a0861575861af460f062c79be643bd5e805cfd345cf389f108670ac76c8cb24c6cfc18755d43eea09ee94e382d26b0bdb7b73c321b0100d4f03b7f355894cf332f830e710b97ce98c8a84abd0b948114ad176e008d33bd60f982b1ff37c8559797a06ef4f0ef61c186324e2b3506383606907b6a7c02b0f9f6157b53c867e4b9166c767b804d46a59b5216cde7a4e99040c5a40433225ee282a1b0a06c523eaf4534d7f83fa1155b0047718cbc546a0d072b04b3564eea1b422273f548271a0bb2316053fa76991955ebd63159434ecebb4e466dae5a1073a6727627097a1049e617d91d361094fa68f0ff77987130305beaba2eda04df997b714d6c6f2c29a6ad5cb4022b02709b",
+                        "eead9d67890cbb22392336fea1851f38")
     }
-    
-    func executeTestCase( _ key:String, _ nonce:String, _ header:String, _ message:String, _ cipher:String, _ tag:String ) {
-        
-        let keyArr     = Array<UInt8>(hex: key)
-        let nonceArr   = Array<UInt8>(hex: nonce)
-        let headerArr  = Array<UInt8>(hex: header)
+
+    func executeTestCase(_ key: String, _ nonce: String, _ header: String, _ message: String, _ cipher: String, _ tag: String) {
+        let keyArr = Array<UInt8>(hex: key)
+        let nonceArr = Array<UInt8>(hex: nonce)
+        let headerArr = Array<UInt8>(hex: header)
         let messageArr = Array<UInt8>(hex: message)
-        let cipherArr  = Array<UInt8>(hex: cipher)
-        let tagArr     = Array<UInt8>(hex: tag)
-        
+        let cipherArr = Array<UInt8>(hex: cipher)
+        let tagArr = Array<UInt8>(hex: tag)
+
         do {
             let encryptResult = try ChaCha20Poly1305.encrypt(message: messageArr, header: headerArr, key: keyArr, nonce: nonceArr)
-            
+
             XCTAssertEqual(encryptResult.cipher, cipherArr, "cipher not equal")
-            XCTAssertEqual(encryptResult.tag, tagArr,  "tag not equal")
+            XCTAssertEqual(encryptResult.tag, tagArr, "tag not equal")
         } catch {
             XCTAssert(false, "Encryption Failed with error: \(error.localizedDescription)")
         }
-        
+
         do {
             let decryptResult = try ChaCha20Poly1305.decrypt(cipher: cipherArr, header: headerArr, key: keyArr, nonce: nonceArr, tag: tagArr)
-            
-            XCTAssertEqual(decryptResult.success, true,  "decrypt mac check failed")
+
+            XCTAssertEqual(decryptResult.success, true, "decrypt mac check failed")
             XCTAssertEqual(decryptResult.message, messageArr, "message not equal")
         } catch {
             XCTAssert(false, "Encryption Failed with error: \(error.localizedDescription)")

Tests/CryptoSwiftTests/ChaCha20Tests.swift

@@ -13,12 +13,11 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
-import Foundation
 @testable import CryptoSwift
+import Foundation
+import XCTest
 
 final class ChaCha20Tests: XCTestCase {
-
     func testChaCha20() {
         let keys: [Array<UInt8>] = [
             [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
@@ -112,7 +111,6 @@ final class ChaCha20Tests: XCTestCase {
 #if !CI
 
     extension ChaCha20Tests {
-
         func testChaCha20Performance() {
             let key: Array<UInt8> = [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f]
             let iv: Array<UInt8> = [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07]
@@ -130,7 +128,6 @@ final class ChaCha20Tests: XCTestCase {
 #endif
 
 extension ChaCha20Tests {
-
     static func allTests() -> [(String, (ChaCha20Tests) -> () -> Void)] {
         var tests = [
             ("testChaCha20", testChaCha20),

Tests/CryptoSwiftTests/DigestTests.swift

@@ -16,12 +16,11 @@
 // http://www.di-mgt.com.au/sha_testvectors.html (http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA_All.pdf)
 //
 
-import XCTest
-import Foundation
 @testable import CryptoSwift
+import Foundation
+import XCTest
 
 final class DigestTests: XCTestCase {
-
     func testMD5() {
         XCTAssertEqual("123".md5(), "202cb962ac59075b964b07152d234b70", "MD5 calculation failed")
         XCTAssertEqual("".md5(), "d41d8cd98f00b204e9800998ecf8427e", "MD5 calculation failed")
@@ -260,7 +259,6 @@ final class DigestTests: XCTestCase {
 #if !CI
 
     extension DigestTests {
-
         func testMD5Performance() {
             measureMetrics([XCTPerformanceMetric.wallClockTime], automaticallyStartMeasuring: false) {
                 let arr = Array<UInt8>(repeating: 200, count: 1024 * 1024)
@@ -281,22 +279,21 @@ final class DigestTests: XCTestCase {
 
         // Keep it to compare
         /*
-        func testSHA1PerformanceCC() {
-            measureMetrics([XCTPerformanceMetric.wallClockTime], automaticallyStartMeasuring: false) {
-                let arr = Array<UInt8>(repeating: 200, count: 1024 * 1024)
-                self.startMeasuring()
-                var digest = Array<UInt8>(repeating: 0, count: Int(CC_SHA1_DIGEST_LENGTH))
-                CC_SHA1(arr, CC_LONG(arr.count), &digest)
-                self.stopMeasuring()
-            }
-        }
+         func testSHA1PerformanceCC() {
+         measureMetrics([XCTPerformanceMetric.wallClockTime], automaticallyStartMeasuring: false) {
+         let arr = Array<UInt8>(repeating: 200, count: 1024 * 1024)
+         self.startMeasuring()
+         var digest = Array<UInt8>(repeating: 0, count: Int(CC_SHA1_DIGEST_LENGTH))
+         CC_SHA1(arr, CC_LONG(arr.count), &digest)
+         self.stopMeasuring()
+         }
+         }
          */
     }
 
 #endif
 
 extension DigestTests {
-
     static func allTests() -> [(String, (DigestTests) -> () -> Void)] {
         var tests = [
             ("testMD5", testMD5),
@@ -311,7 +308,7 @@ extension DigestTests {
             ("testCRC32NotReflected", testCRC32NotReflected),
             ("testCRC16", testCRC16),
             ("testChecksum", testChecksum),
-            ("testSHAPartialUpdates", testSHAPartialUpdates)
+            ("testSHAPartialUpdates", testSHAPartialUpdates),
         ]
 
         #if !CI

Tests/CryptoSwiftTests/ExtensionsTest.swift

@@ -13,12 +13,11 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
-import Foundation
 @testable import CryptoSwift
+import Foundation
+import XCTest
 
 final class ExtensionsTest: XCTestCase {
-
     func testBytes() {
         let size = MemoryLayout<UInt32>.size // 32 or 64  bit
 
@@ -88,7 +87,6 @@ final class ExtensionsTest: XCTestCase {
 #if !CI
 
     extension ExtensionsTest {
-
         func testArrayInitHexPerformance() {
             var str = "b1b2b3b3b3b3b3b3b1b2b3b3b3b3b3b3"
             for _ in 0...12 {
@@ -102,7 +100,6 @@ final class ExtensionsTest: XCTestCase {
 #endif
 
 extension ExtensionsTest {
-
     static func allTests() -> [(String, (ExtensionsTest) -> () -> Void)] {
         var tests = [
             ("testBytes", testBytes),

Tests/CryptoSwiftTests/HKDFTests.swift

@@ -13,14 +13,13 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 class HKDFTests: XCTestCase {
-    
     /// All test cases are implemented with regard to RFC 5869
     /// https://www.ietf.org/rfc/rfc5869.txt
-    
+
     func testHKDF1() {
         let password = Array<UInt8>(hex: "0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")
         let salt = Array<UInt8>(hex: "0x000102030405060708090a0b0c")
@@ -28,10 +27,10 @@ class HKDFTests: XCTestCase {
         let keyLength = 42
         let variant = HMAC.Variant.sha256
         let reference = Array<UInt8>(hex: "0x3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865")
-        
+
         XCTAssertEqual(reference, try HKDF(password: password, salt: salt, info: info, keyLength: keyLength, variant: variant).calculate())
     }
-    
+
     func testHKDF2() {
         let password = Array<UInt8>(hex: "0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f")
         let salt = Array<UInt8>(hex: "0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf")
@@ -39,19 +38,19 @@ class HKDFTests: XCTestCase {
         let keyLength = 82
         let variant = HMAC.Variant.sha256
         let reference = Array<UInt8>(hex: "0xb11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30c58179ec3e87c14c01d5c1f3434f1d87")
-        
+
         XCTAssertEqual(reference, try HKDF(password: password, salt: salt, info: info, keyLength: keyLength, variant: variant).calculate())
     }
-    
+
     func testHKDF3() {
         let password = Array<UInt8>(hex: "0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")
         let keyLength = 42
         let variant = HMAC.Variant.sha256
         let reference = Array<UInt8>(hex: "0x8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4b61a96c8")
-        
+
         XCTAssertEqual(reference, try HKDF(password: password, keyLength: keyLength, variant: variant).calculate())
     }
-    
+
     func testHKDF4() {
         let password = Array<UInt8>(hex: "0x0b0b0b0b0b0b0b0b0b0b0b")
         let salt = Array<UInt8>(hex: "0x000102030405060708090a0b0c")
@@ -59,10 +58,10 @@ class HKDFTests: XCTestCase {
         let keyLength = 42
         let variant = HMAC.Variant.sha1
         let reference = Array<UInt8>(hex: "0x085a01ea1b10f36933068b56efa5ad81a4f14b822f5b091568a9cdd4f155fda2c22e422478d305f3f896")
-        
+
         XCTAssertEqual(reference, try HKDF(password: password, salt: salt, info: info, keyLength: keyLength, variant: variant).calculate())
     }
-    
+
     func testHKDF5() {
         let password = Array<UInt8>(hex: "0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f")
         let salt = Array<UInt8>(hex: "0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf")
@@ -70,16 +69,16 @@ class HKDFTests: XCTestCase {
         let keyLength = 82
         let variant = HMAC.Variant.sha1
         let reference = Array<UInt8>(hex: "0x0bd770a74d1160f7c9f12cd5912a06ebff6adcae899d92191fe4305673ba2ffe8fa3f1a4e5ad79f3f334b3b202b2173c486ea37ce3d397ed034c7f9dfeb15c5e927336d0441f4c4300e2cff0d0900b52d3b4")
-        
+
         XCTAssertEqual(reference, try HKDF(password: password, salt: salt, info: info, keyLength: keyLength, variant: variant).calculate())
     }
-    
+
     func testHKDF6() {
         let password = Array<UInt8>(hex: "0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b")
         let keyLength = 42
         let variant = HMAC.Variant.sha1
         let reference = Array<UInt8>(hex: "0x0ac1af7002b3d761d1e55298da9d0506b9ae52057220a306e07b6b87e8df21d0ea00033de03984d34918")
-        
+
         XCTAssertEqual(reference, try HKDF(password: password, keyLength: keyLength, variant: variant).calculate())
     }
 
@@ -90,7 +89,7 @@ class HKDFTests: XCTestCase {
             ("Test with SHA-256 and zero-length salt/info", testHKDF3),
             ("Basic test case with SHA-1", testHKDF4),
             ("Test with SHA-1 and longer inputs/outputs", testHKDF5),
-            ("Test with SHA-1 and zero-length salt/info", testHKDF6)
+            ("Test with SHA-1 and zero-length salt/info", testHKDF6),
         ]
 
         return tests

Tests/CryptoSwiftTests/HMACTests.swift

@@ -13,11 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 final class HMACTests: XCTestCase {
-
     func testMD5() {
         let key: Array<UInt8> = []
         let msg: Array<UInt8> = []

Tests/CryptoSwiftTests/PBKDF.swift

@@ -13,11 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 class PBKDF: XCTestCase {
-
     func testPBKDF1() {
         let password: Array<UInt8> = [0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64]
         let salt: Array<UInt8> = [0x78, 0x57, 0x8e, 0x5a, 0x5d, 0x63, 0xcb, 0x06]

Tests/CryptoSwiftTests/PaddingTests.swift

@@ -13,11 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 final class PaddingTests: XCTestCase {
-
     func testPKCS7_0() {
         let input: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6]
         let expected: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16]

Tests/CryptoSwiftTests/Poly1305Tests.swift

@@ -13,12 +13,11 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
-import Foundation
 @testable import CryptoSwift
+import Foundation
+import XCTest
 
 final class Poly1305Tests: XCTestCase {
-
     func testPoly1305() {
         let key: Array<UInt8> = [0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc]
         let msg: Array<UInt8> = [0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1]

Tests/CryptoSwiftTests/RabbitTests.swift

@@ -13,11 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 class RabbitTests: XCTestCase {
-
     func testInitialization() {
         var key = Array<UInt8>(repeating: 0, count: Rabbit.keySize - 1)
         var iv: Array<UInt8>?
@@ -119,7 +118,6 @@ class RabbitTests: XCTestCase {
 #if !CI
 
     extension RabbitTests {
-
         func testRabbitPerformance() {
             let key: Array<UInt8> = Array<UInt8>(repeating: 0, count: Rabbit.keySize)
             let iv: Array<UInt8> = Array<UInt8>(repeating: 0, count: Rabbit.ivSize)
@@ -132,7 +130,6 @@ class RabbitTests: XCTestCase {
 #endif
 
 extension RabbitTests {
-
     static func allTests() -> [(String, (RabbitTests) -> () -> Void)] {
         var tests = [
             ("testInitialization", testInitialization),

Tests/CryptoSwiftTests/RandomBytesSequenceTests.swift

@@ -13,11 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-import XCTest
 @testable import CryptoSwift
+import XCTest
 
 class RandomBytesSequenceTests: XCTestCase {
-
     func testSequence() {
         XCTAssertNil(RandomBytesSequence(size: 0).makeIterator().next())
 

Tests/LinuxMain.swift

@@ -1,5 +1,5 @@
-import XCTest
 @testable import CryptoSwiftTests
+import XCTest
 
 XCTMain([
     testCase(DigestTests.allTests()),