X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/88d81c7a634938ca58d003861f6272f5bf56ee9b..fe25ae275b9c98cdd44ca189a2780e8c9c929c34:/src/main/java/org/asamk/signal/manager/util/KeyUtils.java

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 d8861b1b..3285e65a 100644
--- a/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -5,11 +5,18 @@ 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.InvalidKeyException;
 import org.whispersystems.libsignal.ecc.Curve;
 import org.whispersystems.libsignal.ecc.ECKeyPair;
 import org.whispersystems.libsignal.ecc.ECPrivateKey;
+import org.whispersystems.libsignal.state.PreKeyRecord;
+import org.whispersystems.libsignal.state.SignedPreKeyRecord;
+import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.util.Base64;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
 
 public class KeyUtils {
 
@@ -24,6 +31,31 @@ public class KeyUtils {
         return new IdentityKeyPair(djbIdentityKey, djbPrivateKey);
     }
 
+    public static List<PreKeyRecord> generatePreKeyRecords(final int offset, final int batchSize) {
+        List<PreKeyRecord> records = new ArrayList<>(batchSize);
+        for (int i = 0; i < batchSize; i++) {
+            int preKeyId = (offset + i) % Medium.MAX_VALUE;
+            ECKeyPair keyPair = Curve.generateKeyPair();
+            PreKeyRecord record = new PreKeyRecord(preKeyId, keyPair);
+
+            records.add(record);
+        }
+        return records;
+    }
+
+    public static SignedPreKeyRecord generateSignedPreKeyRecord(
+            final IdentityKeyPair identityKeyPair, final int signedPreKeyId
+    ) {
+        ECKeyPair keyPair = Curve.generateKeyPair();
+        byte[] signature;
+        try {
+            signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
+        } catch (InvalidKeyException e) {
+            throw new AssertionError(e);
+        }
+        return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature);
+    }
+
     public static String createSignalingKey() {
         return getSecret(52);
     }
@@ -50,7 +82,7 @@ public class KeyUtils {
 
     private static String getSecret(int size) {
         byte[] secret = getSecretBytes(size);
-        return Base64.encodeBytes(secret);
+        return Base64.getEncoder().encodeToString(secret);
     }
 
     public static byte[] getSecretBytes(int size) {