diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 18:37:30 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 18:37:30 +0200 |
commit | cda1ba47d27c668e99fe212f2ce0977962eabb86 (patch) | |
tree | 056d1cabf88cd9730669ab90abc11be296619aa9 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain | |
parent | ac28b6bbac979b14ff89943965ca63aaf2129a80 (diff) | |
download | open-keychain-cda1ba47d27c668e99fe212f2ce0977962eabb86.tar.gz open-keychain-cda1ba47d27c668e99fe212f2ce0977962eabb86.tar.bz2 open-keychain-cda1ba47d27c668e99fe212f2ce0977962eabb86.zip |
pgpdecryptverify: fix non-onepass signature checking
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java index f31b6af59..39cd65671 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyOperation.java @@ -963,6 +963,8 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp log.add(LogType.MSG_DC_OK, indent); + // TODO return metadata object? + DecryptVerifyResult result = new DecryptVerifyResult(DecryptVerifyResult.RESULT_OK, log); result.setSignatureResult(signatureChecker.getSignatureResult()); result.setDecryptionResult( 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 2fccf2197..a892a8a0d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java @@ -203,7 +203,7 @@ class PgpSignatureChecker { } // check for insecure hash algorithms - if (!PgpSecurityConstants.isSecureHashAlgorithm(onePassSignature.getHashAlgorithm())) { + if (!PgpSecurityConstants.isSecureHashAlgorithm(signature.getHashAlgorithm())) { log.add(LogType.MSG_DC_INSECURE_HASH_ALGO, indent + 1); signatureResultBuilder.setInsecure(true); } |