From 1dbee27c9a6f7e4a3bba9010a3c62aeb724a2d8b Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 29 Oct 2020 11:06:02 +1100 Subject: [PATCH] Store ED25519 key pair for future use --- src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java | 2 ++ .../thoughtcrime/securesms/loki/activities/RegisterActivity.kt | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java index f2fc74b687..b8b5dd6518 100644 --- a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java +++ b/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java @@ -51,6 +51,8 @@ public class IdentityKeyUtil { public static final String IDENTITY_PUBLIC_KEY_PREF = "pref_identity_public_v3"; public static final String IDENTITY_PRIVATE_KEY_PREF = "pref_identity_private_v3"; + public static final String ED25519_PUBLIC_KEY = "pref_ed25519_public_key"; + public static final String ED25519_SECRET_KEY = "pref_ed25519_secret_key"; public static final String lokiSeedKey = "loki_seed"; diff --git a/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt index eaf7e72408..1737b01e5d 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt @@ -13,6 +13,7 @@ import android.text.SpannableStringBuilder import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan import android.text.style.StyleSpan +import android.util.Log import android.view.View import android.widget.Toast import com.goterl.lazycode.lazysodium.LazySodiumAndroid @@ -119,6 +120,8 @@ class RegisterActivity : BaseActionBarActivity() { IdentityKeyUtil.save(this, IdentityKeyUtil.lokiSeedKey, Hex.toStringCondensed(seed)) IdentityKeyUtil.save(this, IdentityKeyUtil.IDENTITY_PUBLIC_KEY_PREF, Base64.encodeBytes(x25519KeyPair!!.publicKey.serialize())) IdentityKeyUtil.save(this, IdentityKeyUtil.IDENTITY_PRIVATE_KEY_PREF, Base64.encodeBytes(x25519KeyPair!!.privateKey.serialize())) + IdentityKeyUtil.save(this, IdentityKeyUtil.ED25519_PUBLIC_KEY, Base64.encodeBytes(ed25519KeyPair!!.publicKey.asBytes)) + IdentityKeyUtil.save(this, IdentityKeyUtil.ED25519_SECRET_KEY, Base64.encodeBytes(ed25519KeyPair!!.secretKey.asBytes)) val userHexEncodedPublicKey = x25519KeyPair!!.hexEncodedPublicKey val registrationID = KeyHelper.generateRegistrationId(false) TextSecurePreferences.setLocalRegistrationId(this, registrationID)