aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.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/PgpDecryptVerify.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/PgpDecryptVerify.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java12
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
index c009d1b5c..a5ccfbd3b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -122,9 +122,6 @@ public class PgpDecryptVerify {
/**
* Allow these key ids alone for decryption.
* This means only ciphertexts encrypted for one of these private key can be decrypted.
- *
- * @param allowedKeyIds
- * @return
*/
public Builder setAllowedKeyIds(Set<Long> allowedKeyIds) {
this.mAllowedKeyIds = allowedKeyIds;
@@ -496,10 +493,7 @@ public class PgpDecryptVerify {
// Verify signature and check binding signatures
boolean validSignature = signature.verify(messageSignature);
- boolean validKeyBinding = signingRing.verifySubkeyBinding(signingKey);
-
signatureResultBuilder.validSignature(validSignature);
- signatureResultBuilder.validKeyBinding(validKeyBinding);
}
}
@@ -643,10 +637,8 @@ public class PgpDecryptVerify {
// Verify signature and check binding signatures
boolean validSignature = signature.verify();
- boolean validKeyBinding = signingRing.verifySubkeyBinding(signingKey);
signatureResultBuilder.validSignature(validSignature);
- signatureResultBuilder.validKeyBinding(validKeyBinding);
}
result.setSignatureResult(signatureResultBuilder.build());
@@ -657,10 +649,6 @@ public class PgpDecryptVerify {
/**
* Mostly taken from ClearSignedFileProcessor in Bouncy Castle
- *
- * @param sig
- * @param line
- * @throws SignatureException
*/
private static void processLine(PGPSignature sig, byte[] line)
throws SignatureException {