diff options
| author | Tim Bray <tbray@textuality.com> | 2014-11-21 19:45:35 -0800 |
|---|---|---|
| committer | Tim Bray <tbray@textuality.com> | 2014-11-21 19:45:35 -0800 |
| commit | 734a085f0d9350b6aa4053c2d28c0f4e8db5f79a (patch) | |
| tree | 42426847a64030abc483b646e16872e98b1b9b15 | |
| parent | e72c082acd9f17be4a21970603df0f6a621221d7 (diff) | |
| parent | 9c133d343fbc297ed6f3ee39b74cea5dfcc9c207 (diff) | |
| download | open-keychain-734a085f0d9350b6aa4053c2d28c0f4e8db5f79a.tar.gz open-keychain-734a085f0d9350b6aa4053c2d28c0f4e8db5f79a.tar.bz2 open-keychain-734a085f0d9350b6aa4053c2d28c0f4e8db5f79a.zip | |
Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | 3 |
1 files changed, 1 insertions, 2 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 5a8bfda29..5589a3521 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -337,7 +337,6 @@ public class PgpDecryptVerify extends BaseOperation { if (signatureResult.getStatus() != OpenPgpSignatureResult.SIGNATURE_SUCCESS_CERTIFIED && signatureResult.getStatus() != OpenPgpSignatureResult.SIGNATURE_SUCCESS_UNCERTIFIED) { - Log.d(Constants.TAG, "STATUS IS " + signatureResult.getStatus()); log.add(LogType.MSG_VL_ERROR_INTEGRITY_CHECK, indent); return new DecryptVerifyResult(DecryptVerifyResult.RESULT_ERROR, log); } @@ -794,7 +793,7 @@ public class PgpDecryptVerify extends BaseOperation { // Handle missing integrity protection like failed integrity protection! // The MDC packet can be stripped by an attacker! if (signatureResult.getStatus() != OpenPgpSignatureResult.SIGNATURE_SUCCESS_CERTIFIED - || signatureResult.getStatus() != OpenPgpSignatureResult.SIGNATURE_SUCCESS_UNCERTIFIED) { + && signatureResult.getStatus() != OpenPgpSignatureResult.SIGNATURE_SUCCESS_UNCERTIFIED) { log.add(LogType.MSG_DC_ERROR_INTEGRITY_CHECK, indent); return new DecryptVerifyResult(DecryptVerifyResult.RESULT_ERROR, log); } |