From 23cb3c942602e265412c17191dcd994b957e141a Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 28 Mar 2018 21:17:32 +0200 Subject: [PATCH] Use only two subkeys in default configuration --- .../java/org/sufficientlysecure/keychain/Constants.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 000ef4495..fa3ac244d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -187,13 +187,11 @@ public final class Constants { } /** - * Default key configuration: 3072 bit RSA (certify, sign, encrypt) + * Default key configuration: 3072 bit RSA (certify + sign, encrypt) */ public static void addDefaultSubkeys(SaveKeyringParcel.Builder builder) { builder.addSubkeyAdd(SubkeyAdd.createSubkeyAdd(SaveKeyringParcel.Algorithm.RSA, - 3072, null, KeyFlags.CERTIFY_OTHER, 0L)); - builder.addSubkeyAdd(SubkeyAdd.createSubkeyAdd(SaveKeyringParcel.Algorithm.RSA, - 3072, null, KeyFlags.SIGN_DATA, 0L)); + 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)); }