e2e

iOSClient/Main/CCMain.m

@@ -4998,17 +4998,6 @@
         // se il file esiste andiamo direttamente al delegato altrimenti carichiamolo
         if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, _metadata.fileID]]) {
             
-#ifdef DEBUG
-            // TEST ENCRYPTED/DECRYPTED
-            if ([_metadata.fileName containsString:@".dms"]) {
-                [[NCEndToEndEncryption sharedManager] decryptMetadata:_metadata activeUrl:app.directoryUser];
-            }
-            
-            if ([_metadata.fileName containsString:@"test_encry_marino.jpg"]) {
-                [[NCEndToEndEncryption sharedManager] encryptMetadata:_metadata activeUrl:app.directoryUser];
-            }
-#endif
-            
             [self downloadFileSuccess:_metadata.fileID serverUrl:serverUrl selector:selectorLoadFileView selectorPost:nil];
             
         } else {

iOSClient/Security/NCEndToEndEncryption.h

@@ -30,7 +30,7 @@
 + (instancetype)sharedManager;
 
 - (void)encryptMetadata:(tableMetadata *)metadata activeUrl:(NSString *)activeUrl;
-- (void)decryptMetadata:(tableMetadata *)metadata activeUrl:(NSString *)activeUrl;
+- (NSString *)decryptMetadata:(NSString *)cipher key:(NSString *)key iv:(NSString *)iv tag:(NSString *)tag;
 
 - (NSString *)createCSR:(NSString *)userID directoryUser:(NSString *)directoryUser;
 - (NSString *)encryptPrivateKey:(NSString *)userID directoryUser: (NSString *)directoryUser passphrase:(NSString *)passphrase privateKey:(NSString **)privateKey;

iOSClient/Security/NCEndToEndEncryption.m

@@ -527,7 +527,8 @@ cleanup:
     }
 }
 
-- (void)decryptMetadata:(tableMetadata *)metadata activeUrl:(NSString *)activeUrl
+/*
+- (void)decryptMetadata:(NSString *)metadata activeUrl:(NSString *)activeUrl
 {
     NSMutableData *plainData;
     
@@ -542,6 +543,25 @@ cleanup:
         [plainData writeToFile:[NSString stringWithFormat:@"%@/%@", activeUrl, @"decrypted"] atomically:YES];
     }
 }
+*/
+
+- (NSString *)decryptMetadata:(NSString *)cipher key:(NSString *)key iv:(NSString *)iv tag:(NSString *)tag
+{
+    NSMutableData *plainData;
+    
+    NSData *cipherData = [cipher dataUsingEncoding:NSUTF8StringEncoding];
+    NSData *keyData = [key dataUsingEncoding:NSUTF8StringEncoding];
+    NSData *ivData = [iv dataUsingEncoding:NSUTF8StringEncoding];
+    NSData *tagData = [tag dataUsingEncoding:NSUTF8StringEncoding];
+
+    
+    BOOL result = [self decryptData:cipherData plainData:&plainData keyData:keyData keyLen:AES_KEY_128_LENGTH ivData:ivData tagData:tagData];
+    
+    if (plainData != nil && result)
+        return [[NSString alloc] initWithData:plainData encoding:NSUTF8StringEncoding];
+    else
+        return nil;
+}
 
 // Encryption using GCM mode
 - (BOOL)encryptData:(NSData *)plainData cipherData:(NSMutableData **)cipherData keyData:(NSData *)keyData keyLen:(int)keyLen ivData:(NSData *)ivData tagData:(NSData **)tagData