From: AsamK <asamk@gmx.de>
Date: Mon, 21 Dec 2020 09:25:36 +0000 (+0100)
Subject: Move IdentityKeyPair generation to KeyUtils
X-Git-Tag: v0.7.3~49
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/88d81c7a634938ca58d003861f6272f5bf56ee9b

Move IdentityKeyPair generation to KeyUtils

in preparation for rust libsignal which doesn't provide the method
---

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 9a6afe70..666c085e 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -317,7 +317,7 @@ public class Manager implements Closeable {
         PathConfig pathConfig = PathConfig.createDefault(settingsPath);
 
         if (!SignalAccount.userExists(pathConfig.getDataPath(), username)) {
-            IdentityKeyPair identityKey = KeyHelper.generateIdentityKeyPair();
+            IdentityKeyPair identityKey = KeyUtils.generateIdentityKeyPair();
             int registrationId = KeyHelper.generateRegistrationId(false);
 
             ProfileKey profileKey = KeyUtils.createProfileKey();
diff --git a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
index 8b3f0eb4..4195e8af 100644
--- a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
+++ b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
@@ -52,7 +52,7 @@ public class ProvisioningManager {
         this.serviceConfiguration = serviceConfiguration;
         this.userAgent = userAgent;
 
-        identityKey = KeyHelper.generateIdentityKeyPair();
+        identityKey = KeyUtils.generateIdentityKeyPair();
         registrationId = KeyHelper.generateRegistrationId(false);
         password = KeyUtils.createPassword();
         final SleepTimer timer = new UptimeSleepTimer();
diff --git a/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 3f9ec08f..d8861b1b 100644
--- a/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -3,6 +3,11 @@ package org.asamk.signal.manager.util;
 import org.asamk.signal.util.RandomUtils;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.IdentityKeyPair;
+import org.whispersystems.libsignal.ecc.Curve;
+import org.whispersystems.libsignal.ecc.ECKeyPair;
+import org.whispersystems.libsignal.ecc.ECPrivateKey;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.util.Base64;
 
@@ -11,6 +16,14 @@ public class KeyUtils {
     private KeyUtils() {
     }
 
+    public static IdentityKeyPair generateIdentityKeyPair() {
+        ECKeyPair djbKeyPair = Curve.generateKeyPair();
+        IdentityKey djbIdentityKey = new IdentityKey(djbKeyPair.getPublicKey());
+        ECPrivateKey djbPrivateKey = djbKeyPair.getPrivateKey();
+
+        return new IdentityKeyPair(djbIdentityKey, djbPrivateKey);
+    }
+
     public static String createSignalingKey() {
         return getSecret(52);
     }