Create account entropy pool instead of master key

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index c4cf148409d9c0e6737f19fe08388d03595b2e2d..4d43d15d6e47fcb3ee3feeb340726c43ebe31471 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1550,9 +1550,7 @@ public class SignalAccount implements Closeable {
             return key;
         }
 
             return key;
         }
 

-        pinMasterKey = KeyUtils.createMasterKey();
-        save();
-        return pinMasterKey;
+        return getOrCreateAccountEntropyPool().deriveMasterKey();

     }
 
     private MasterKey getMasterKey() {
     }
 
     private MasterKey getMasterKey() {

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 21c8aa960b76d1d13344f3225c617b4f948d61cd..37a0bf827a4385f5c5e6ec8c3d0755a43e03fea3 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -15,7 +15,6 @@ import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.backup.MediaRootBackupKey;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.backup.MediaRootBackupKey;

-import org.whispersystems.signalservice.api.kbs.MasterKey;

 
 import java.security.SecureRandom;
 import java.util.ArrayList;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;


@@ -109,10 +108,6 @@ public class KeyUtils {
         return getSecretBytes(32);
     }
 
         return getSecretBytes(32);
     }
 

-    public static MasterKey createMasterKey() {
-        return MasterKey.createNew(secureRandom);
-    }
-

     public static MediaRootBackupKey createMediaRootBackupKey() {
         return new MediaRootBackupKey(getSecretBytes(32));
     }
     public static MediaRootBackupKey createMediaRootBackupKey() {
         return new MediaRootBackupKey(getSecretBytes(32));
     }