cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into encrypted-export

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-09 14:57:54 +02:00
parent 315ed608ae eff4ae5551
commit 759ffc5a4b
4 changed files with 83 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java
View File

@@ -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;