ErrorProblem -> Error (enum Error: Swift.Error)

Sources/CryptoSwift/AES.swift

@@ -11,7 +11,7 @@
 private typealias Key = SecureBytes
 
 final public class AES: BlockCipher {
-    public enum ErrorProblem: Error {
+    public enum Error: Swift.Error {
         case dataPaddingRequired
         case invalidKeyOrInitializationVector
         case invalidInitializationVector
@@ -104,7 +104,7 @@ final public class AES: BlockCipher {
 
         if (blockMode.options.contains(.InitializationVectorRequired) && self.iv.count != AES.blockSize) {
             assert(false, "Block size and Initialization Vector must be the same length!")
-            throw ErrorProblem.invalidInitializationVector
+            throw Error.invalidInitializationVector
         }
     }
 }
@@ -492,7 +492,7 @@ extension AES: Cipher {
         }
 
         if blockMode.options.contains(.PaddingRequired) && (out.count % AES.blockSize != 0) {
-            throw ErrorProblem.dataPaddingRequired
+            throw Error.dataPaddingRequired
         }
 
         return out
@@ -500,7 +500,7 @@ extension AES: Cipher {
 
     public func decrypt(_ bytes:Array<UInt8>) throws -> Array<UInt8> {
         if blockMode.options.contains(.PaddingRequired) && (bytes.count % AES.blockSize != 0) {
-            throw ErrorProblem.dataPaddingRequired
+            throw Error.dataPaddingRequired
         }
 
         var oneTimeCryptor = self.makeDecryptor()

Sources/CryptoSwift/Authenticator.swift

@@ -11,7 +11,7 @@
 */
 public enum Authenticator {
     
-    public enum ErrorProblem: Error {
+    public enum Error: Swift.Error {
         case authenticateError
     }
     
@@ -32,12 +32,12 @@ public enum Authenticator {
         switch (self) {
         case .Poly1305(let key):
             guard let auth = CryptoSwift.Poly1305(key: key)?.authenticate(bytes) else {
-                throw ErrorProblem.authenticateError
+                throw Error.authenticateError
             }
             return auth
         case .HMAC(let key, let variant):
             guard let auth = CryptoSwift.HMAC(key: key, variant: variant)?.authenticate(bytes) else {
-                throw ErrorProblem.authenticateError
+                throw Error.authenticateError
             }
             return auth
         }

Sources/CryptoSwift/ChaCha20.swift

@@ -8,7 +8,7 @@
 
 final public class ChaCha20: BlockCipher {
     
-    public enum ErrorProblem: Error {
+    public enum Error: Swift.Error {
         case missingContext
     }
     
@@ -115,7 +115,7 @@ final public class ChaCha20: BlockCipher {
     private final func encryptBytes(_ message:Array<UInt8>) throws -> Array<UInt8> {
         
         guard let ctx = context else {
-            throw ErrorProblem.missingContext
+            throw Error.missingContext
         }
         
         var c:Array<UInt8> = Array<UInt8>(repeating: 0, count: message.count)
@@ -166,7 +166,7 @@ final public class ChaCha20: BlockCipher {
 extension ChaCha20: Cipher {
     public func encrypt(_ bytes:Array<UInt8>) throws -> Array<UInt8> {
         guard context != nil else {
-            throw ErrorProblem.missingContext
+            throw Error.missingContext
         }
 
         return try encryptBytes(bytes)

Sources/CryptoSwift/Foundation/AES+Foundation.swift

@@ -11,7 +11,7 @@ import Foundation
 extension AES {
     convenience public init(key:String, iv:String, blockMode:BlockMode = .CBC, padding: Padding = PKCS7()) throws {
         guard let kkey = key.bridge().data(using: String.Encoding.utf8.rawValue, allowLossyConversion: false)?.bytes, let iiv = iv.bridge().data(using: String.Encoding.utf8.rawValue, allowLossyConversion: false)?.bytes else {
-            throw ErrorProblem.invalidKeyOrInitializationVector
+            throw Error.invalidKeyOrInitializationVector
         }
         
         try self.init(key: kkey, iv: iiv, blockMode: blockMode, padding: padding)

Sources/CryptoSwift/PKCS5/PBKDF1.swift

@@ -15,7 +15,7 @@ public extension PKCS5 {
     /// some applications.
     public struct PBKDF1 {
 
-        public enum ErrorProblem: Error {
+        public enum Error: Swift.Error {
             case invalidInput
             case derivedKeyTooLong
         }
@@ -59,11 +59,11 @@ public extension PKCS5 {
             let keyLength = keyLength ?? variant.size
 
             if (keyLength > variant.size) {
-                throw ErrorProblem.derivedKeyTooLong
+                throw Error.derivedKeyTooLong
             }
 
             guard let t1 = variant.calculateHash(password + salt) else {
-                throw ErrorProblem.invalidInput
+                throw Error.invalidInput
             }
 
             self.iterations = iterations

Sources/CryptoSwift/PKCS5/PBKDF2.swift

@@ -19,7 +19,7 @@ public extension PKCS5 {
     ///          DK = PBKDF2(PRF, Password, Salt, c, dkLen)
     public struct PBKDF2 {
 
-        public enum ErrorProblem: Error {
+        public enum Error: Swift.Error {
             case invalidInput
             case derivedKeyTooLong
         }
@@ -39,14 +39,14 @@ public extension PKCS5 {
             precondition(iterations > 0)
             
             guard let prf = HMAC(key: password, variant: variant), iterations > 0 && !password.isEmpty && !salt.isEmpty else {
-                throw ErrorProblem.invalidInput
+                throw Error.invalidInput
             }
 
             self.dkLen = keyLength ?? variant.size
             let keyLengthFinal = Double(self.dkLen)
             let hLen = Double(prf.variant.size)
             if keyLengthFinal > (pow(2,32) - 1) * hLen {
-                throw ErrorProblem.derivedKeyTooLong
+                throw Error.derivedKeyTooLong
             }
 
             self.salt = salt

Sources/CryptoSwift/PKCS7.swift

@@ -11,7 +11,7 @@
 
 public struct PKCS7: Padding {
 
-    public enum ErrorProblem: Error {
+    public enum Error: Swift.Error {
         case invalidPaddingValue
     }