From c3f8d68ceb9def96048cfcb1b4c9c4b98ede1e45 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sun, 15 Dec 2024 21:14:40 +0100 Subject: [PATCH] Create account entropy pool instead of master key --- .../java/org/asamk/signal/manager/storage/SignalAccount.java | 4 +--- .../main/java/org/asamk/signal/manager/util/KeyUtils.java | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) 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 c4cf1484..4d43d15d 100644 --- 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; } - pinMasterKey = KeyUtils.createMasterKey(); - save(); - return pinMasterKey; + return getOrCreateAccountEntropyPool().deriveMasterKey(); } 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 21c8aa96..37a0bf82 100644 --- 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.whispersystems.signalservice.api.kbs.MasterKey; import java.security.SecureRandom; import java.util.ArrayList; @@ -109,10 +108,6 @@ public class KeyUtils { return getSecretBytes(32); } - public static MasterKey createMasterKey() { - return MasterKey.createNew(secureRandom); - } - public static MediaRootBackupKey createMediaRootBackupKey() { return new MediaRootBackupKey(getSecretBytes(32)); } -- 2.50.1