Merge pull request #39 from vijaysingh-axway/MOD-2533

fix(ios): db migration issue fixed
tidev · Sep 30, 2019 · 7e71998 · 7e71998
2 parents baf9b87 + b8356ae
commit 7e71998
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/ios/Classes/AppceleratorEncrypteddatabaseDBProxy.m b/ios/Classes/AppceleratorEncrypteddatabaseDBProxy.m
@@ -98,7 +98,7 @@ -(BOOL)needCipherMigrate:(NSString*)name_
     NSFileManager *fm = [NSFileManager defaultManager];
     NSString *versionFile = [[dbPath stringByAppendingPathComponent:name_] stringByAppendingPathExtension:@"version"];
     BOOL versionExists = [fm fileExistsAtPath:versionFile];
-    NSString *currentVersion = @"2.0.4";
+    NSString *currentVersion = @"2.0.7";
     BOOL migrate = YES;
 
     if (versionExists) {

diff --git a/ios/Classes/PlausibleDatabase/EncPLSqliteDatabase.m b/ios/Classes/PlausibleDatabase/EncPLSqliteDatabase.m
@@ -229,18 +229,36 @@ - (BOOL) openAndMigrate: (NSError **) error {
         return NO;
     }
     char *errMsg;
-    //disable hmac cipher for backwards compatibility
-    err = sqlite3_exec(_sqlite, [@"PRAGMA cipher_use_hmac = OFF;" UTF8String], NULL, NULL, &errMsg);
+
+    //prepare existing database for migration
+    err = sqlite3_exec(_sqlite, [@"PRAGMA cipher_page_size = 1024;" UTF8String], NULL, NULL, &errMsg);
     if (err != SQLITE_OK) {
         NSLog([@"[ERROR] " stringByAppendingString:[NSString stringWithCString:errMsg encoding:NSUTF8StringEncoding]]);
         [self populateError: error
               withErrorCode: EncPLDatabaseErrorCipherMigrateFailed
-                description: NSLocalizedString(@"Cipher migrate: failed to disable hmac cipher.", @"")
+                description: NSLocalizedString(@"Cipher migrate: failed to prepare database for migration.", @"")
                 queryString: nil];
         return NO;
     }
-    //prepare existing database for migration
-    err = sqlite3_exec(_sqlite, [@"PRAGMA kdf_iter = 4000;" UTF8String], NULL, NULL, &errMsg);
+    err = sqlite3_exec(_sqlite, [@"PRAGMA kdf_iter = 64000;" UTF8String], NULL, NULL, &errMsg);
+    if (err != SQLITE_OK) {
+        NSLog([@"[ERROR] " stringByAppendingString:[NSString stringWithCString:errMsg encoding:NSUTF8StringEncoding]]);
+        [self populateError: error
+              withErrorCode: EncPLDatabaseErrorCipherMigrateFailed
+                description: NSLocalizedString(@"Cipher migrate: failed to prepare database for migration.", @"")
+                queryString: nil];
+        return NO;
+    }
+    err = sqlite3_exec(_sqlite, [@"PRAGMA cipher_hmac_algorithm = HMAC_SHA1;" UTF8String], NULL, NULL, &errMsg);
+    if (err != SQLITE_OK) {
+        NSLog([@"[ERROR] " stringByAppendingString:[NSString stringWithCString:errMsg encoding:NSUTF8StringEncoding]]);
+        [self populateError: error
+              withErrorCode: EncPLDatabaseErrorCipherMigrateFailed
+                description: NSLocalizedString(@"Cipher migrate: failed to prepare database for migration.", @"")
+                queryString: nil];
+        return NO;
+    }
+    err = sqlite3_exec(_sqlite, [@"PRAGMA cipher_kdf_algorithm = PBKDF2_HMAC_SHA1;" UTF8String], NULL, NULL, &errMsg);
     if (err != SQLITE_OK) {
         NSLog([@"[ERROR] " stringByAppendingString:[NSString stringWithCString:errMsg encoding:NSUTF8StringEncoding]]);
         [self populateError: error

diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.0.6
+version: 2.0.7
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: Provides transparent, secure 256-bit AES encryption of SQLite database files.