String and NSData extension

CryptoSwift/NSDataExtension.swift

@@ -64,6 +64,14 @@ extension NSData {
         return CRC().crc32(self);
     }
 
+    public func encrypt(cipher: Cipher) -> NSData {
+        return cipher.encrypt(self)
+    }
+
+    public func decrypt(cipher: Cipher) -> NSData {
+        return cipher.decrypt(self)
+    }
+
     internal func toHexString() -> String {
         let count = self.length / sizeof(Byte)
         var bytesArray = [Byte](count: count, repeatedValue: 0)

CryptoSwift/StringExtension.swift

@@ -40,4 +40,12 @@ extension String {
         return self.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.crc32().toHexString()
     }
 
+    public func encrypt(cipher: Cipher) -> String? {
+        return self.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.encrypt(cipher).toHexString()
+    }
+
+    public func decrypt(cipher: Cipher) -> String? {
+        return self.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.decrypt(cipher).toHexString()
+    }
+
 }

CryptoSwiftTests/CipherTests.swift

@@ -57,12 +57,12 @@ class CipherTests: XCTestCase {
             let encrypted = Cipher.ChaCha20(setup).encrypt(messageData)
             let decrypted = Cipher.ChaCha20(setup).decrypt(encrypted)
             XCTAssertEqual(messageData, decrypted, "ChaCha20 decryption failed");
-            
-            if (encrypted.isEqual(decrypted)) {
-                print("FAIL!")
-            }
-            
             XCTAssertEqual(encrypted.hexString, expectedHex, "ChaCha20 failed");
+
+            // check extension
+            let encrypted2 = messageData.encrypt(Cipher.ChaCha20(setup))
+            XCTAssertEqual(encrypted, encrypted2, "ChaCha20 extension failed")
+            
         }
     }
 }

README.md

@@ -28,11 +28,11 @@ Good mood
 
 ##Usage
 
-Generally you should use `CryptoSwift.Hash`,`CryptoSwift.Cipher` enums or convenience extensions
+    import CryptoSwift
 
-CryptoHash enum usage
+Generally you should use `CryptoSwift.Hash`,`CryptoSwift.Cipher` enums or convenience extensions
 
-    import CryptoSwift
+Hash enum usage
     
     /* Hash enum usage */
     var data:NSData = NSData(bytes: [49, 50, 51] as [Byte], length: 3)