Implemented --importId command line option and adapted TODO.txt.

1 files changed, 9 insertions, 10 deletions

diff --git a/src/main/java/org/openslx/satellitedaemon/App.java b/src/main/java/org/openslx/satellitedaemon/App.java
index 34d61ed..b413280 100644
--- a/src/main/java/org/openslx/satellitedaemon/App.java
+++ b/src/main/java/org/openslx/satellitedaemon/App.java
@@ -27,7 +27,7 @@ public class App
 		int i = 0;
 		String arg;
 		String organizationName;
-		String modulus, privExp, pubExp;
+		BigInteger modulus, privExp, pubExp;
 		String ipAddress;
 
 		// Check if there are arguments available and if they start with "--".
@@ -57,9 +57,9 @@ public class App
 					System.exit( 2 );
 				} else {
 					organizationName = args[i++];
-					modulus = args[i++];
-					privExp = args[i++];
-					pubExp = args[i++];
+					modulus = new BigInteger( args[i++] );
+					privExp = new BigInteger( args[i++] );
+					pubExp = new BigInteger( args[i++] );
 					if ( importId( organizationName, modulus, privExp, pubExp ) ) {
 						System.exit( 0 );
 					} else
@@ -122,15 +122,14 @@ public class App
 
 	private static boolean genId( String organizationName )
 	{
-		if ( Identity.generateIdentity( organizationName ) )
-			return true;
-		return false;
+		return Identity.generateIdentity( organizationName );
 	}
 
-	private static boolean importId( String organizationName, String modulus, String privExp, String pubExp )
+	private static boolean importId( String organizationName, BigInteger modulus, BigInteger privExp, BigInteger pubExp )
 	{
-		// TODO.
-		return false;
+		if ( !Identity.isValidKeyPair( modulus, privExp, pubExp ) )
+			return false;
+		return Identity.importIdentity( organizationName, modulus, privExp, pubExp );
 	}
 
 	private static boolean submitKey( String ipAddress )