diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-11 13:35:48 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-11 13:35:48 +0200 |
commit | 4da273ac16fc93524bc6212e2b0477904155a4f5 (patch) | |
tree | aec05b3b09a7848d43580f3ffb31ea8ab680bd7e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | 4345e0309d0863267bbcad5089f141dd290ac65e (diff) | |
download | open-keychain-4da273ac16fc93524bc6212e2b0477904155a4f5.tar.gz open-keychain-4da273ac16fc93524bc6212e2b0477904155a4f5.tar.bz2 open-keychain-4da273ac16fc93524bc6212e2b0477904155a4f5.zip |
modifyKey: error out on nonexisting new primary user id
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 10 |
1 files changed, 10 insertions, 0 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 21527159b..3c29d361a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -344,6 +344,9 @@ public class PgpKeyOperation { // 3. If primary user id changed, generate new certificates for both old and new if (saveParcel.changePrimaryUserId != null) { + + // keep track if we actually changed one + boolean ok = false; log.add(LogLevel.INFO, LogType.MSG_MF_UID_PRIMARY, indent); indent += 1; @@ -395,6 +398,7 @@ public class PgpKeyOperation { if (currentCert.hasSubpackets() && currentCert.getHashedSubPackets().isPrimaryUserID()) { // if it's the one we want, just leave it as is if (userId.equals(saveParcel.changePrimaryUserId)) { + ok = true; continue; } // otherwise, generate new non-primary certification @@ -420,6 +424,7 @@ public class PgpKeyOperation { masterPrivateKey, masterPublicKey, userId, true, masterKeyFlags); modifiedPublicKey = PGPPublicKey.addCertification( modifiedPublicKey, userId, newCert); + ok = true; } // user id is not primary and is not supposed to be - nothing to do here. @@ -427,6 +432,11 @@ public class PgpKeyOperation { } indent -= 1; + + if (!ok) { + log.add(LogLevel.ERROR, LogType.MSG_MF_ERROR_NOEXIST_PRIMARY, indent); + return null; + } } // Update the secret key ring |