فهرست منبع

Fix Blowfish convenience initializer (remove iv, default to CBC)

Marcin Krzyżanowski 7 سال پیش
والد
کامیت
37a8a85790
2فایلهای تغییر یافته به همراه4 افزوده شده و 3 حذف شده
  1. 1 1
      Sources/CryptoSwift/Blowfish.swift
  2. 3 2
      Sources/CryptoSwift/Foundation/Blowfish+Foundation.swift

+ 1 - 1
Sources/CryptoSwift/Blowfish.swift

@@ -312,7 +312,7 @@ public final class Blowfish {
         ],
     ]
 
-    public init(key: Array<UInt8>, iv: Array<UInt8>? = nil, blockMode: BlockMode = .CBC(iv: Array<UInt8>(repeating: 0, count: Blowfish.blockSize)), padding: Padding) throws {
+    public init(key: Array<UInt8>, blockMode: BlockMode = .CBC(iv: Array<UInt8>(repeating: 0, count: Blowfish.blockSize)), padding: Padding) throws {
         precondition(key.count >= 5 && key.count <= 56)
 
         self.blockMode = blockMode

+ 3 - 2
Sources/CryptoSwift/Foundation/Blowfish+Foundation.swift

@@ -18,7 +18,8 @@ import Foundation
 
 extension Blowfish {
 
-    public convenience init(key: String, iv: String, blockMode: BlockMode = .CBC(iv: Array<UInt8>(repeating: 0, count: Blowfish.blockSize)), padding: Padding = .pkcs7) throws {
-        try self.init(key: key.bytes, iv: iv.bytes, blockMode: blockMode, padding: padding)
+    /// 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)
     }
 }