coding

Cartfile.resolved

@@ -19,7 +19,7 @@ github "malcommac/SwiftRichString" "3.7.2"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
 github "marinofaggiana/TOPasscodeViewController" "0.0.7"
 github "marinofaggiana/XLForm" "eb9381ad8129f60402bf412250fb31b95a628a08"
-github "nextcloud/ios-communication-library" "252237149f9476a80155f33c322d7232caa3d0dc"
+github "nextcloud/ios-communication-library" "2a935494166363495e903f63e382e74da2ebac69"
 github "realm/realm-cocoa" "v5.2.0"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.5"

iOSClient/Networking/NCNetworkingE2EE.swift

@@ -67,9 +67,7 @@ import Alamofire
                                                                 
                                 NCCommunication.shared.markE2EEFolder(fileId: metadataFolder!.fileId, delete: false) { (account, errorCode, errorDescription) in
                                     if errorCode == 0 {
-                                        
-                                        /* NEW VERSION
-                                         
+                                                                                 
                                         let object = tableE2eEncryption()
                                         
                                         NCEndToEndEncryption.sharedManager()?.encryptkey(&key, initializationVector: &initializationVector)
@@ -102,7 +100,6 @@ import Alamofire
                                         self.sendE2EMetadata(account: account, serverUrl: serverUrl, fileNameRename: nil, fileNameNewRename: nil, deleteE2eEncryption: nil, url: url) { (e2eToken, errorCode, errorDescription) in
                                             self.NotificationPost(name: k_notificationCenter_createFolder, serverUrl: serverUrl, userInfo: ["fileName": fileName, "serverUrl": serverUrl, "errorCode": errorCode], errorDescription: errorDescription, completion: completion)
                                         }
-                                        */
                                         
                                         self.NotificationPost(name: k_notificationCenter_reloadDataSource, serverUrl: serverUrl, userInfo: ["serverUrl": serverUrl, "errorCode": errorCode], errorDescription: errorDescription, completion: completion)
                                         

iOSClient/Security/NCEndToEndEncryption.m

@@ -31,7 +31,7 @@
 
 #define addName(field, value) X509_NAME_add_entry_by_txt(name, field, MBSTRING_ASC, (unsigned char *)value, -1, -1, 0); NSLog(@"%s: %s", field, value);
 
-#define IV_DELIMITER_ENCODED        @"fA==" // @"|" //@"fA==" // "|" base64 encoded
+#define IV_DELIMITER_ENCODED        @"|" //@"fA==" // "|" base64 encoded
 #define PBKDF2_INTERACTION_COUNT    1024
 #define PBKDF2_KEY_LENGTH           256
 //#define PBKDF2_SALT                 @"$4$YmBjm3hk$Qb74D5IUYwghUmzsMqeNFx5z0/8$"