Update BlockModeOptions naming to small-caps

Sources/CryptoSwift/AES.swift

@@ -133,7 +133,7 @@ public final class AES: BlockCipher {
             self.iv = defaultIV
         }
 
-        if blockMode.options.contains(.InitializationVectorRequired) && self.iv.count != AES.blockSize {
+        if blockMode.options.contains(.initializationVectorRequired) && self.iv.count != AES.blockSize {
             assert(false, "Block size and Initialization Vector must be the same length!")
             throw Error.invalidInitializationVector
         }
@@ -145,7 +145,7 @@ fileprivate extension AES {
 
     func encrypt(block: Array<UInt8>) -> Array<UInt8>? {
 
-        if blockMode.options.contains(.PaddingRequired) && block.count != AES.blockSize {
+        if blockMode.options.contains(.paddingRequired) && block.count != AES.blockSize {
             return Array(block)
         }
 
@@ -234,7 +234,7 @@ fileprivate extension AES {
 
     func decrypt(block: Array<UInt8>) -> Array<UInt8>? {
 
-        if blockMode.options.contains(.PaddingRequired) && block.count != AES.blockSize {
+        if blockMode.options.contains(.paddingRequired) && block.count != AES.blockSize {
             return block
         }
 
@@ -448,7 +448,7 @@ extension AES {
         init(aes: AES) {
             self.padding = aes.padding
             self.worker = aes.blockMode.worker(aes.iv, cipherOperation: aes.encrypt)
-            self.paddingRequired = aes.blockMode.options.contains(.PaddingRequired)
+            self.paddingRequired = aes.blockMode.options.contains(.paddingRequired)
         }
 
         public mutating func update(withBytes bytes: ArraySlice<UInt8>, isLast: Bool = false) throws -> Array<UInt8> {
@@ -498,7 +498,7 @@ extension AES {
                 self.worker = aes.blockMode.worker(aes.iv, cipherOperation: aes.decrypt)
             }
 
-            self.paddingRequired = aes.blockMode.options.contains(.PaddingRequired)
+            self.paddingRequired = aes.blockMode.options.contains(.paddingRequired)
         }
 
         public mutating func update(withBytes bytes: ArraySlice<UInt8>, isLast: Bool = false) throws -> Array<UInt8> {
@@ -581,7 +581,7 @@ extension AES: Cipher {
         // Padding may be added at the very end
         out += try oneTimeCryptor.finish()
 
-        if blockMode.options.contains(.PaddingRequired) && (out.count % AES.blockSize != 0) {
+        if blockMode.options.contains(.paddingRequired) && (out.count % AES.blockSize != 0) {
             throw Error.dataPaddingRequired
         }
 
@@ -589,7 +589,7 @@ extension AES: Cipher {
     }
 
     public func decrypt(_ bytes: ArraySlice<UInt8>) throws -> Array<UInt8> {
-        if blockMode.options.contains(.PaddingRequired) && (bytes.count % AES.blockSize != 0) {
+        if blockMode.options.contains(.paddingRequired) && (bytes.count % AES.blockSize != 0) {
             throw Error.dataPaddingRequired
         }
 

Sources/CryptoSwift/BlockMode/BlockMode.swift

@@ -39,17 +39,17 @@ public enum BlockMode {
     var options: BlockModeOptions {
         switch self {
         case .ECB:
-            return .PaddingRequired
+            return .paddingRequired
         case .CBC:
-            return [.InitializationVectorRequired, .PaddingRequired]
+            return [.initializationVectorRequired, .paddingRequired]
         case .CFB:
-            return .InitializationVectorRequired
+            return .initializationVectorRequired
         case .CTR:
-            return .InitializationVectorRequired
+            return .initializationVectorRequired
         case .OFB:
-            return .InitializationVectorRequired
+            return .initializationVectorRequired
         case .PCBC:
-            return [.InitializationVectorRequired, .PaddingRequired]
+            return [.initializationVectorRequired, .paddingRequired]
         }
     }
 }

Sources/CryptoSwift/BlockMode/BlockModeOptions.swift

@@ -17,7 +17,7 @@
 struct BlockModeOptions: OptionSet {
     let rawValue: Int
 
-    static let None = BlockModeOptions(rawValue: 0)
-    static let InitializationVectorRequired = BlockModeOptions(rawValue: 1)
-    static let PaddingRequired = BlockModeOptions(rawValue: 2)
+    static let none = BlockModeOptions(rawValue: 0)
+    static let initializationVectorRequired = BlockModeOptions(rawValue: 1)
+    static let paddingRequired = BlockModeOptions(rawValue: 2)
 }

Sources/CryptoSwift/Blowfish.swift

@@ -338,7 +338,7 @@ public final class Blowfish {
             self.iv = Array<UInt8>(repeating: 0, count: Blowfish.blockSize)
         }
 
-        if blockMode.options.contains(.InitializationVectorRequired) && self.iv.count != Blowfish.blockSize {
+        if blockMode.options.contains(.initializationVectorRequired) && self.iv.count != Blowfish.blockSize {
             assert(false, "Block size and Initialization Vector must be the same length!")
             throw Error.invalidInitializationVector
         }
@@ -517,7 +517,7 @@ extension Blowfish: Cipher {
             out += encryptWorker.encrypt(chunk)
         }
 
-        if blockMode.options.contains(.PaddingRequired) && (out.count % Blowfish.blockSize != 0) {
+        if blockMode.options.contains(.paddingRequired) && (out.count % Blowfish.blockSize != 0) {
             throw Error.dataPaddingRequired
         }
 
@@ -530,7 +530,7 @@ extension Blowfish: Cipher {
     /// - Returns: Plaintext data
     public func decrypt<C: Collection>(_ bytes: C) throws -> Array<UInt8> where C.Element == UInt8, C.IndexDistance == Int, C.Index == Int {
 
-        if blockMode.options.contains(.PaddingRequired) && (bytes.count % Blowfish.blockSize != 0) {
+        if blockMode.options.contains(.paddingRequired) && (bytes.count % Blowfish.blockSize != 0) {
             throw Error.dataPaddingRequired
         }