diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-09 14:57:54 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-09 14:57:54 +0200 |
| commit | 759ffc5a4b79a87c6c916bb44a1570613235bdc8 (patch) | |
| tree | 1def4d8fb47b25d44193463251a5eb081e68bc2a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
| parent | 315ed608ae977f1a25f1cd06a4e2d52ca09e01b2 (diff) | |
| parent | eff4ae5551f286f4c870c3f9db44ceb73c3c2fcf (diff) | |
| download | open-keychain-759ffc5a4b79a87c6c916bb44a1570613235bdc8.tar.gz open-keychain-759ffc5a4b79a87c6c916bb44a1570613235bdc8.tar.bz2 open-keychain-759ffc5a4b79a87c6c916bb44a1570613235bdc8.zip | |
Merge branch 'master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java index 4067372a1..ed5566bc1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java @@ -133,7 +133,7 @@ class PgpSignatureChecker { KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(sigKeyId) ); CanonicalizedPublicKey keyCandidate = signingRing.getPublicKey(sigKeyId); - if ( ! signingKey.canSign()) { + if ( ! keyCandidate.canSign()) { continue; } signatureIndex = i; @@ -156,7 +156,7 @@ class PgpSignatureChecker { KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(sigKeyId) ); CanonicalizedPublicKey keyCandidate = signingRing.getPublicKey(sigKeyId); - if ( ! signingKey.canSign()) { + if ( ! keyCandidate.canSign()) { continue; } signatureIndex = i; |