aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-01-03 22:14:12 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-01-03 22:14:12 +0100
commit47ace7cea31ee794ed88bdf4163dd38fc33e8fc5 (patch)
treeb7578d09cb285a208f1e125007c1dba5ac435887 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
parent2192a6baddd09ae81f86a8bfd5e844086154f5ba (diff)
downloadopen-keychain-47ace7cea31ee794ed88bdf4163dd38fc33e8fc5.tar.gz
open-keychain-47ace7cea31ee794ed88bdf4163dd38fc33e8fc5.tar.bz2
open-keychain-47ace7cea31ee794ed88bdf4163dd38fc33e8fc5.zip
make certify routines more robust (#1016)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
index 3bd412c36..d231038da 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
@@ -94,6 +94,12 @@ public class CertifyOperation extends BaseOperation {
try {
+ if (action.mMasterKeyId == parcel.mMasterKeyId) {
+ log.add(LogType.MSG_CRT_ERROR_SELF, 2);
+ certifyError += 1;
+ continue;
+ }
+
if (action.mUserIds == null) {
log.add(LogType.MSG_CRT_CERTIFY_ALL, 2,
KeyFormattingUtils.convertKeyIdToHex(action.mMasterKeyId));