aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-06 14:52:12 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-06 14:52:12 +0100
commitaf762a65a0a225181153f95ce957fc042c6a9930 (patch)
tree7e247ecfa48f1a17ab5af14488e110d6e32756f0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
parente34ad18ed26166751f6897169056044c2d19ce67 (diff)
parent0c3f9ae0a67cb98b2ac3ac59985aec03e6a15861 (diff)
downloadopen-keychain-af762a65a0a225181153f95ce957fc042c6a9930.tar.gz
open-keychain-af762a65a0a225181153f95ce957fc042c6a9930.tar.bz2
open-keychain-af762a65a0a225181153f95ce957fc042c6a9930.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
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.java4
1 files changed, 2 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 4f086c2a6..b58df085f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -84,7 +84,7 @@ public class PgpDecryptVerify extends BaseOperation {
private boolean mDecryptMetadataOnly;
private byte[] mDecryptedSessionKey;
- private PgpDecryptVerify(Builder builder) {
+ protected PgpDecryptVerify(Builder builder) {
super(builder.mContext, builder.mProviderHelper, builder.mProgressable);
// private Constructor can only be called from Builder
@@ -633,7 +633,7 @@ public class PgpDecryptVerify extends BaseOperation {
// Handle missing integrity protection like failed integrity protection!
// The MDC packet can be stripped by an attacker!
if (!signatureResultBuilder.isValidSignature()) {
- log.add(LogType.MSG_DC_ERROR_INTEGRITY_CHECK, indent);
+ log.add(LogType.MSG_DC_ERROR_INTEGRITY_MISSING, indent);
return new DecryptVerifyResult(DecryptVerifyResult.RESULT_ERROR, log);
}
}