diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-19 14:42:40 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-19 14:42:40 +0200 |
commit | 6a3150d8788664a5e1d501488159ff5e080cb9b4 (patch) | |
tree | 4dfa238be0b5376f7d4cc15801e42f70c57eb523 /OpenKeychain/src/main/java | |
parent | 4a280f6ba36f35d21e87642d74d3e9dfdf6f09d1 (diff) | |
download | open-keychain-6a3150d8788664a5e1d501488159ff5e080cb9b4.tar.gz open-keychain-6a3150d8788664a5e1d501488159ff5e080cb9b4.tar.bz2 open-keychain-6a3150d8788664a5e1d501488159ff5e080cb9b4.zip |
fix primary user id in master key flag modification
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index c69eeaf04..88c6437d3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -881,10 +881,12 @@ public class PgpKeyOperation { } // add shiny new user id certificate + boolean isPrimary = currentCert.getHashedSubPackets() != null && + currentCert.getHashedSubPackets().isPrimaryUserID(); modifiedPublicKey = PGPPublicKey.removeCertification( modifiedPublicKey, userId, currentCert); PGPSignature newCert = generateUserIdSignature( - masterPrivateKey, masterPublicKey, userId, true, flags, expiry); + masterPrivateKey, masterPublicKey, userId, isPrimary, flags, expiry); modifiedPublicKey = PGPPublicKey.addCertification( modifiedPublicKey, userId, newCert); ok = true; |