浏览代码

Change databaseEncryptionKey for use with 64 char ASCII

marinofaggiana 6 年之前
父节点
当前提交
4f8c9a0788
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      iOSClient/Brand/NCBrand.swift
  2. 2 2
      iOSClient/Database/NCManageDatabase.swift

+ 2 - 2
iOSClient/Brand/NCBrand.swift

@@ -90,8 +90,8 @@ class NCBrandColor: NSObject {
     // Capabilities Group
     @objc public let capabilitiesGroups:                String = "group.it.twsweb.Crypto-Cloud"
     
-    // Database key encryption key 64byte AES-256+SHA2
-    @objc public var databaseEncryptionKey:             String = "LdFNb00N+ywBuNGJRjCUuDt1zIXK/PX82ZNHWochfu1is8TorIERQi1aJsAMLC3rK2BB0uMjh2kNZ9Dcwx/G5Q=="
+    // Database key 64 char (for encryption AES-256+SHA2
+    @objc public var databaseEncryptionKey:             String = "1234567890123456789012345678901234567890123456789012345678901234"
     
     // Options
     @objc public let use_login_web_personalized:        Bool = false                                                // Don't touch me !!

+ 2 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -49,7 +49,7 @@ class NCManageDatabase: NSObject {
         
         // Encrypting the database file on disk with AES-256+SHA2 by supplying a 64-byte encryption key
         if NCBrandOptions.sharedInstance.use_database_encryption {
-            if let keyData = Data(base64Encoded: NCBrandOptions.sharedInstance.databaseEncryptionKey) {
+            if let keyData = NCBrandOptions.sharedInstance.databaseEncryptionKey.data(using: String.Encoding.utf8, allowLossyConversion: false) {
                 configCompact.encryptionKey = keyData
             }
         }
@@ -131,7 +131,7 @@ class NCManageDatabase: NSObject {
         
         // Encrypting the database file on disk with AES-256+SHA2 by supplying a 64-byte encryption key
         if NCBrandOptions.sharedInstance.use_database_encryption {
-            if let keyData = Data(base64Encoded: NCBrandOptions.sharedInstance.databaseEncryptionKey) {
+            if let keyData = NCBrandOptions.sharedInstance.databaseEncryptionKey.data(using: String.Encoding.utf8, allowLossyConversion: false) {
                 config.encryptionKey = keyData
             }
         }