From 0caeca0b6606fb47ec0c8c6cf4f505f54e27d393 Mon Sep 17 00:00:00 2001 From: segfault-bilibili Date: Sat, 18 Mar 2023 10:47:31 +0800 Subject: [PATCH] Make ECC 25519 the default generated key type --- .../org/sufficientlysecure/keychain/Constants.java | 10 +++++----- .../keychain/ui/dialog/AddSubkeyDialogFragment.java | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 0df5c3e85..3e6454da5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -180,13 +180,13 @@ public final class Constants { } /** - * Default key configuration: 3072 bit RSA (certify + sign, encrypt) + * Default key configuration: EDDSA (certify + sign), Curve25519 ECDH (encrypt) */ public static void addDefaultSubkeys(SaveKeyringParcel.Builder builder) { - builder.addSubkeyAdd(SubkeyAdd.createSubkeyAdd(SaveKeyringParcel.Algorithm.RSA, - 3072, null, KeyFlags.CERTIFY_OTHER | KeyFlags.SIGN_DATA, 0L)); - builder.addSubkeyAdd(SubkeyAdd.createSubkeyAdd(SaveKeyringParcel.Algorithm.RSA, - 3072, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L)); + builder.addSubkeyAdd(SubkeyAdd.createSubkeyAdd(SaveKeyringParcel.Algorithm.EDDSA, + null, null, KeyFlags.CERTIFY_OTHER | KeyFlags.SIGN_DATA, 0L)); + builder.addSubkeyAdd(SubkeyAdd.createSubkeyAdd(SaveKeyringParcel.Algorithm.ECDH, + null, SaveKeyringParcel.Curve.CV25519, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L)); } /** diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java index 00f6c12ac..c8b36b292 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java @@ -165,9 +165,8 @@ public class AddSubkeyDialogFragment extends DialogFragment { TwoLineArrayAdapter adapter = new TwoLineArrayAdapter(context, android.R.layout.simple_spinner_item, choices); mKeyTypeSpinner.setAdapter(adapter); - // make RSA 3072 the default for (int i = 0; i < choices.size(); ++i) { - if (choices.get(i).getId() == SupportedKeyType.RSA_3072) { + if (choices.get(i).getId() == SupportedKeyType.ECC_25519) { mKeyTypeSpinner.setSelection(i); break; }