chenge verifyKeyPairOnServerWithPublicKey

iOSClient/CCGlobal.h

@@ -41,6 +41,9 @@ extern NSString *const dav;
 // UUID
 #define k_UUID_SIM                                      @"4BACFE4A-61A6-44B1-9A85-13FD167565AB"
 
+// Mnemonic test EndToEnd Encryption
+#define k_Mnemonic_test                                 @"moreovertelevisionfactorytendencyindependenceinternationalintellectualimpressinterestvolunteer"
+
 #define k_dismissAfterSecond                            4
 
 #define k_daysOfActivity                                7

iOSClient/Main/CCMain.m

@@ -1270,7 +1270,7 @@
     
     // Verify KeyPair on server
     publicKey = metadataNet.options;
-    [[NCEndToEndEncryption sharedManager] verifyKeyPairOnServerWithMnemonic:mnemonic publicKey:publicKey privateKeyCipher:privateKeyChiper publicKeyServer:publicKeyServer];
+    [[NCEndToEndEncryption sharedManager] verifyKeyPairOnServerWithPublicKey:publicKey privateKeyCipher:privateKeyChiper publicKeyServer:publicKeyServer viewController:self];
     
     // Activity
     [[NCManageDatabase sharedInstance] addActivityClient:@"" fileID:@"" action:k_activityDebugActionEndToEndEncryption selector:metadataNet.selector note:@"EndToEndPublicKeys present on Server" type:k_activityTypeSuccess verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
@@ -1365,8 +1365,8 @@
     
     // Verify KeyPair on server
     privateKeyChiper = metadataNet.options;
-    [[NCEndToEndEncryption sharedManager] verifyKeyPairOnServerWithMnemonic:mnemonic publicKey:publicKey privateKeyCipher:privateKeyChiper publicKeyServer:publicKeyServer];
-    
+    [[NCEndToEndEncryption sharedManager] verifyKeyPairOnServerWithPublicKey:publicKey privateKeyCipher:privateKeyChiper publicKeyServer:publicKeyServer viewController:self];
+
     // Activity
     [[NCManageDatabase sharedInstance] addActivityClient:@"" fileID:@"" action:k_activityDebugActionEndToEndEncryption selector:metadataNet.selector note:@"EndToEndPrivateKey present on Server" type:k_activityTypeSuccess verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
 }
@@ -1384,7 +1384,7 @@
             [CCUtility setEndToEndMnemonic:app.activeAccount mnemonic:nil];
             
             NSString *mnemonic = [[NYMnemonic generateMnemonicString:@128 language:@"english"] stringByReplacingOccurrencesOfString:@" " withString:@""];
-            mnemonic = @"moreovertelevisionfactorytendencyindependenceinternationalintellectualimpressinterestvolunteer";
+            mnemonic = k_Mnemonic_test;
             
             NSString *privateKeyCipher = [[NCEndToEndEncryption sharedManager] createEndToEndPrivateKey:app.activeUserID directoryUser:app.directoryUser mnemonic:mnemonic];
             
@@ -1464,8 +1464,8 @@
 {
     // Verify KeyPair on server
     publicKeyServer = metadataNet.options;
-    [[NCEndToEndEncryption sharedManager] verifyKeyPairOnServerWithMnemonic:mnemonic publicKey:publicKey privateKeyCipher:privateKeyChiper publicKeyServer:publicKeyServer];
-    
+    [[NCEndToEndEncryption sharedManager] verifyKeyPairOnServerWithPublicKey:publicKey privateKeyCipher:privateKeyChiper publicKeyServer:publicKeyServer viewController:self];
+
     // Activity
     [[NCManageDatabase sharedInstance] addActivityClient:@"" fileID:@"" action:k_activityDebugActionEndToEndEncryption selector:metadataNet.selector note:@"EndToEndServerPublicKey present on Server" type:k_activityTypeSuccess verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
 }

iOSClient/Security/NCEndToEndEncryption.h

@@ -36,7 +36,7 @@
 
 - (NSString *)createEndToEndPublicKey:(NSString *)userID directoryUser:(NSString *)directoryUser;
 - (NSString *)createEndToEndPrivateKey:(NSString *)userID directoryUser: (NSString *)directoryUser mnemonic:(NSString *)mnemonic;
-- (void)verifyKeyPairOnServerWithMnemonic:(NSString *)mnemonic publicKey:(NSString *)publicKey privateKeyCipher:(NSString *)privateKeyCipher publicKeyServer:(NSString *)publicKeyServer;
+- (void)verifyKeyPairOnServerWithPublicKey:(NSString *)publicKey privateKeyCipher:(NSString *)privateKeyCipher publicKeyServer:(NSString *)publicKeyServer viewController:(UIViewController *)viewController;
 
 - (void)removeCSRToDisk:(NSString *)directoryUser;
 - (void)removePrivateKeyToDisk:(NSString *)directoryUser;

iOSClient/Security/NCEndToEndEncryption.m

@@ -319,19 +319,25 @@ cleanup:
     [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, fileNamePrivateKey] error:nil];
 }
 
-- (void)verifyKeyPairOnServerWithMnemonic:(NSString *)mnemonic publicKey:(NSString *)publicKey privateKeyCipher:(NSString *)privateKeyCipher publicKeyServer:(NSString *)publicKeyServer
+#
+#pragma mark - Register client for Server with exists Key pair
+#
+
+- (void)verifyKeyPairOnServerWithPublicKey:(NSString *)publicKey privateKeyCipher:(NSString *)privateKeyCipher publicKeyServer:(NSString *)publicKeyServer viewController:(UIViewController *)viewController
 {
     // verify is all the keys and mnemonic are available
-    if (mnemonic.length == 0 || publicKey.length == 0 || privateKeyCipher.length == 0 || publicKeyServer.length == 0)
+    if (publicKey.length == 0 || privateKeyCipher.length == 0 || publicKeyServer.length == 0)
         return;
     
-    
-}
+    // mnemonic
+    NSString *mnemonic = k_Mnemonic_test;
 
-#
-#pragma mark - XXXXXXX
-#
 
+    
+    // Get IV
+    NSString *initVector;
+    
+}
 
 #
 #pragma mark - Encrypt/Decrypt AES/GCM/NoPadding as cipher (128 bit key size)