diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-06 15:06:36 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-06 15:06:36 +0200 |
commit | 8f40c6df5108f30dc424e4d802f49f3392738724 (patch) | |
tree | 2d5c20bd06f2ae6f526e9d24a6a16d9384fa9a18 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | dfc396a44cc84556ee190418a0a5bc5752b0f148 (diff) | |
download | open-keychain-8f40c6df5108f30dc424e4d802f49f3392738724.tar.gz open-keychain-8f40c6df5108f30dc424e4d802f49f3392738724.tar.bz2 open-keychain-8f40c6df5108f30dc424e4d802f49f3392738724.zip |
use only primary and mutually bound subkeys for fingerprint verification
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java index 18a27dd96..6f1e78ce6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java @@ -154,8 +154,13 @@ public abstract class CanonicalizedKeyRing extends KeyRing { return getRing().getEncoded(); } - public boolean containsSubkey(String expectedFingerprint) { + /// Returns true iff the keyring contains a primary key or mutually bound subkey with the expected fingerprint + public boolean containsBoundSubkey(String expectedFingerprint) { for (CanonicalizedPublicKey key : publicKeyIterator()) { + boolean isMasterOrMutuallyBound = key.isMasterKey() || key.canSign(); + if (!isMasterOrMutuallyBound) { + continue; + } if (KeyFormattingUtils.convertFingerprintToHex( key.getFingerprint()).equalsIgnoreCase(expectedFingerprint)) { return true; |