Upgrade Swift Tools version (5.1)

 - Migrate Package files to Xcode 11.
 - Remove images from project (in favor of Imgur).

Author: Fernando Fernandes

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,15 +1,21 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 
 import PackageDescription
 
 let package = Package(
     name: "AESCryptable",
     products: [
-        .library(name: "AESCryptable", targets: ["AESCryptable"]),
+        .library(
+            name: "AESCryptable",
+            targets: ["AESCryptable"]),
     ],
     dependencies: [],
     targets: [
-        .target(name: "AESCryptable", dependencies: []),
-        .testTarget(name: "AESCryptableTests",dependencies: ["AESCryptable"]),
+        .target(
+            name: "AESCryptable",
+            dependencies: []),
+        .testTarget(
+            name: "AESCryptableTests",
+            dependencies: ["AESCryptable"]),
     ]
 )

AESCryptable.XcodeSPM.gif

@@ -13,7 +13,7 @@ Provides [`Advanced Encryption Standard (AES)`](https://en.wikipedia.org/wiki/Ad
 
 ## Integration
 ### Xcode 11+
-![AESCryptable Xcode 11 SPM](https://github.com/backslash-f/aescryptable/blob/master/AESCryptable.XcodeSPM.gif)
+![AESCryptable Xcode 11 SPM](https://i.imgur.com/JKciz5T.gif)
 
 More from WWDC 2019:  
 [Adopting Swift Packages in Xcode](https://developer.apple.com/videos/play/wwdc2019/408/)  
@@ -59,4 +59,4 @@ do {
 ## Demo
 Clone the repo and use `AESCryptable.playground` to see the code in action:
 
-![AESCryptable Demo](https://github.com/backslash-f/aescryptable/blob/master/AESCryptable.playground.gif)
+![AESCryptable Demo](https://i.imgur.com/6cI5Knu.gif)

AESCryptable.playground.gif

@@ -19,11 +19,11 @@ import CommonCrypto
 ///
 /// Interesting reading: [Differences between DES and AES](http://bit.ly/desVSaes)
 public struct AES {
-    
+
     // MARK: - Internal Properties
 
     // MARK: Key Related
-    
+
     public let key: Data
 
     // MARK: CCCrypt Related
@@ -41,7 +41,7 @@ public struct AES {
     /// - Parameter keyString: 256 bit AES key size.
     /// - Throws: `AESError`
     public init(keyString: String) throws {
-        
+
         guard keyString.count == kCCKeySizeAES256 else {
             throw AES.Error.invalidKeySize
         }

Package.swift

@@ -16,26 +16,26 @@ extension AES: Cryptable {
     // MARK: - Encrypt
 
     public func encrypt(_ string: String) throws -> Data {
-        
+
         let dataToEncrypt: Data = Data(string.utf8)
-        
+
         let bufferSize: Int = ivSize + dataToEncrypt.count + kCCBlockSizeAES128
         var buffer = Data(count: bufferSize)
         try generateRandomIV(for: &buffer)
-        
+
         var numberBytesEncrypted: Int = 0
-        
+
         do {
             try key.withUnsafeBytes { keyBytes in
                 try dataToEncrypt.withUnsafeBytes { dataToEncryptBytes in
                     try buffer.withUnsafeMutableBytes { bufferBytes in
-                        
+
                         guard let keyBytesBaseAddress = keyBytes.baseAddress,
                             let dataToEncryptBytesBaseAddress = dataToEncryptBytes.baseAddress,
                             let bufferBytesBaseAddress = bufferBytes.baseAddress else {
                                 throw Error.encryptionFailed
                         }
-                        
+
                         let cryptStatus: CCCryptorStatus = CCCrypt( // Stateless, one-shot encrypt operation
                             CCOperation(kCCEncrypt),                // op: CCOperation
                             CCAlgorithm(kCCAlgorithmAES),           // alg: CCAlgorithm
@@ -49,7 +49,7 @@ extension AES: Cryptable {
                             bufferSize,                             // dataOutAvailable: encrypted Data buffer size
                             &numberBytesEncrypted                   // dataOutMoved: the number of bytes written
                         )
-                        
+
                         guard cryptStatus == CCCryptorStatus(kCCSuccess) else {
                             throw Error.encryptionFailed
                         }
@@ -59,31 +59,31 @@ extension AES: Cryptable {
         } catch {
             throw Error.encryptionFailed
         }
-        
+
         let encryptedData: Data = buffer[..<(numberBytesEncrypted + ivSize)]
         return encryptedData
     }
 
     // MARK: - Decrypt
 
     public func decrypt(_ data: Data) throws -> String {
-        
+
         let bufferSize: Int = data.count - ivSize
         var buffer = Data(count: bufferSize)
-        
+
         var numberBytesDecrypted: Int = 0
-        
+
         do {
             try key.withUnsafeBytes { keyBytes in
                 try data.withUnsafeBytes { dataToDecryptBytes in
                     try buffer.withUnsafeMutableBytes { bufferBytes in
-                        
+
                         guard let keyBytesBaseAddress = keyBytes.baseAddress,
                             let dataToDecryptBytesBaseAddress = dataToDecryptBytes.baseAddress,
                             let bufferBytesBaseAddress = bufferBytes.baseAddress else {
                                 throw Error.encryptionFailed
                         }
-                        
+
                         let cryptStatus: CCCryptorStatus = CCCrypt( // Stateless, one-shot encrypt operation
                             CCOperation(kCCDecrypt),                // op: CCOperation
                             CCAlgorithm(kCCAlgorithmAES128),        // alg: CCAlgorithm
@@ -97,7 +97,7 @@ extension AES: Cryptable {
                             bufferSize,                             // dataOutAvailable: decrypted Data buffer size
                             &numberBytesDecrypted                   // dataOutMoved: the number of bytes written
                         )
-                        
+
                         guard cryptStatus == CCCryptorStatus(kCCSuccess) else {
                             throw Error.decryptionFailed
                         }
@@ -107,13 +107,13 @@ extension AES: Cryptable {
         } catch {
             throw Error.encryptionFailed
         }
-        
+
         let decryptedData: Data = buffer[..<numberBytesDecrypted]
-        
+
         guard let decryptedString = String(data: decryptedData, encoding: .utf8) else {
             throw Error.dataToStringFailed
         }
-        
+
         return decryptedString
     }
 }

README.md

@@ -35,26 +35,26 @@ public extension AES {
 // MARK: - Internal Extension
 
 internal extension AES {
-    
+
     /// Generates an `Initialization Vector` with random data for the `Cipher Block Chaining (CBC)` mode with
     /// block size `kCCBlockSizeAES128` and append it to the give `Data`.
     ///
     /// - Parameter data: The `Data` in which the generated `iv` will be attached into.
     /// - Throws: `AESError`
     func generateRandomIV(for data: inout Data) throws {
-        
+
         try data.withUnsafeMutableBytes { dataBytes in
-            
+
             guard let dataBytesBaseAddress = dataBytes.baseAddress else {
                 throw Error.generateRandomIVFailed
             }
-            
+
             let status: Int32 = SecRandomCopyBytes(
                 kSecRandomDefault,
                 kCCBlockSizeAES128,
                 dataBytesBaseAddress
             )
-            
+
             guard status == 0 else {
                 throw Error.generateRandomIVFailed
             }

Sources/AESCryptable/AES.swift

@@ -10,7 +10,7 @@ import Foundation
 
 /// Conform to this protocol to implement and provide encryption / decryption capabilities.
 protocol Cryptable {
-    
+
     /// Encrypts the given `String` and returns it as `Data`.
     ///
     /// - Parameter string: The information to be encrypted.