浏览代码

Remove obsolete BlockModeGenerator.options

Marcin Krzyżanowski 9 年之前
父节点
当前提交
6097dedada

+ 0 - 1
Sources/CryptoSwift/BlockMode/BlockModeGenerator.swift

@@ -15,6 +15,5 @@ enum BlockError: ErrorType {
 typealias CipherOperationOnBlock = (block: [UInt8]) -> [UInt8]?
 
 protocol BlockModeGenerator: GeneratorType {
-    var options: BlockModeOptions { get }
     init(iv: Array<UInt8>, cipherOperation: CipherOperationOnBlock, inputGenerator: AnyGenerator<Element>)
 }

+ 0 - 2
Sources/CryptoSwift/BlockMode/CBC.swift

@@ -10,7 +10,6 @@
 
 struct CBCModeEncryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>
@@ -38,7 +37,6 @@ struct CBCModeEncryptGenerator: BlockModeGenerator {
 
 struct CBCModeDecryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>

+ 0 - 2
Sources/CryptoSwift/BlockMode/CFB.swift

@@ -10,7 +10,6 @@
 
 struct CFBModeEncryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>
@@ -38,7 +37,6 @@ struct CFBModeEncryptGenerator: BlockModeGenerator {
 
 struct CFBModeDecryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>

+ 0 - 2
Sources/CryptoSwift/BlockMode/CTR.swift

@@ -10,7 +10,6 @@
 
 struct CTRModeEncryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>
@@ -41,7 +40,6 @@ struct CTRModeEncryptGenerator: BlockModeGenerator {
 
 struct CTRModeDecryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>

+ 0 - 1
Sources/CryptoSwift/BlockMode/ECB.swift

@@ -10,7 +10,6 @@
 
 struct ECBModeEncryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>

+ 0 - 2
Sources/CryptoSwift/BlockMode/OFB.swift

@@ -10,7 +10,6 @@
 
 struct OFBModeEncryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>
@@ -38,7 +37,6 @@ struct OFBModeEncryptGenerator: BlockModeGenerator {
 
 struct OFBModeDecryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>

+ 0 - 2
Sources/CryptoSwift/BlockMode/PCBC.swift

@@ -10,7 +10,6 @@
 
 struct PCBCModeEncryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>
@@ -38,7 +37,6 @@ struct PCBCModeEncryptGenerator: BlockModeGenerator {
 
 struct PCBCModeDecryptGenerator: BlockModeGenerator {
     typealias Element = Array<UInt8>
-    let options: BlockModeOptions = [.InitializationVectorRequired, .PaddingRequired]
 
     private let iv: Element
     private let inputGenerator: AnyGenerator<Element>