aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-18 22:07:14 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-19 00:14:28 +0200
commitb40b429bc0db920e36351a8fd4189e473dc554c5 (patch)
tree91a6718bfc416cd3948a71d987813504e616bdc6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java
parent0db425b28981209136f738c3ddaac3e549779a88 (diff)
downloadopen-keychain-b40b429bc0db920e36351a8fd4189e473dc554c5.tar.gz
open-keychain-b40b429bc0db920e36351a8fd4189e473dc554c5.tar.bz2
open-keychain-b40b429bc0db920e36351a8fd4189e473dc554c5.zip
remove obsolete subkey binding check from signature verification
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java
index 5e49497c0..75f8bdb66 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java
@@ -35,7 +35,6 @@ public class OpenPgpSignatureResultBuilder {
private boolean mSignatureAvailable = false;
private boolean mKnownKey = false;
private boolean mValidSignature = false;
- private boolean mValidKeyBinding = false;
private boolean mIsSignatureKeyCertified = false;
public void signatureOnly(boolean signatureOnly) {
@@ -58,10 +57,6 @@ public class OpenPgpSignatureResultBuilder {
this.mValidSignature = validSignature;
}
- public void validKeyBinding(boolean validKeyBinding) {
- this.mValidKeyBinding = validKeyBinding;
- }
-
public void signatureKeyCertified(boolean isSignatureKeyCertified) {
this.mIsSignatureKeyCertified = isSignatureKeyCertified;
}
@@ -77,7 +72,7 @@ public class OpenPgpSignatureResultBuilder {
// valid sig!
if (mKnownKey) {
- if (mValidKeyBinding && mValidSignature) {
+ if (mValidSignature) {
result.setKeyId(mKeyId);
result.setUserId(mUserId);
@@ -89,8 +84,7 @@ public class OpenPgpSignatureResultBuilder {
result.setStatus(OpenPgpSignatureResult.SIGNATURE_SUCCESS_UNCERTIFIED);
}
} else {
- Log.d(Constants.TAG, "Error!\nvalidKeyBinding: " + mValidKeyBinding
- + "\nvalidSignature: " + mValidSignature);
+ Log.d(Constants.TAG, "Error! Invalid signature.");
result.setStatus(OpenPgpSignatureResult.SIGNATURE_ERROR);
}
} else {