Merge branch 'master' into master

Author: mikemee

Source/Cipher/Cipher.swift

@@ -36,4 +36,16 @@ extension Connection {
         try check(sqlite3_rekey(handle, key, Int32(key.utf8.count)))
     }
 
+    public func key(key: Blob) throws {
+        try check(sqlite3_key(handle, key.bytes, Int32(key.bytes.count)))
+        try execute(
+            "CREATE TABLE \"__SQLCipher.swift__\" (\"cipher key check\");\n" +
+            "DROP TABLE \"__SQLCipher.swift__\";"
+        )
+    }
+    
+    public func rekey(key: Blob) throws {
+        try check(sqlite3_rekey(handle, key.bytes, Int32(key.bytes.count)))
+    }
+    
 }

Tests/CipherTests.swift

@@ -4,12 +4,22 @@ import SQLiteCipher
 class CipherTests: XCTestCase {
 
     let db = try! Connection()
+    let db2 = try! Connection()
 
     override func setUp() {
+        // db
         try! db.key("hello")
 
         try! db.run("CREATE TABLE foo (bar TEXT)")
         try! db.run("INSERT INTO foo (bar) VALUES ('world')")
+        
+        // db2
+        let keyData = NSMutableData(length: 64)!
+        let _ = SecRandomCopyBytes(kSecRandomDefault, 64, UnsafeMutablePointer<UInt8>(keyData.mutableBytes))
+        try! db2.key(Blob(bytes: keyData.bytes, length: keyData.length))
+        
+        try! db2.run("CREATE TABLE foo (bar TEXT)")
+        try! db2.run("INSERT INTO foo (bar) VALUES ('world')")
 
         super.setUp()
     }
@@ -22,6 +32,18 @@ class CipherTests: XCTestCase {
         try! db.rekey("goodbye")
         XCTAssertEqual(1, db.scalar("SELECT count(*) FROM foo") as? Int64)
     }
+    
+    func test_data_key() {
+        XCTAssertEqual(1, db2.scalar("SELECT count(*) FROM foo") as? Int64)
+    }
+    
+    func test_data_rekey() {
+        let keyData = NSMutableData(length: 64)!
+        SecRandomCopyBytes(kSecRandomDefault, 64, UnsafeMutablePointer<UInt8>(keyData.mutableBytes))
+        
+        try! db2.rekey(Blob(bytes: keyData.bytes, length: keyData.length))
+        XCTAssertEqual(1, db2.scalar("SELECT count(*) FROM foo") as? Int64)
+    }
 
     func test_keyFailure() {
         let path = "\(NSTemporaryDirectory())/db.sqlite3"