diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-03 21:07:33 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-03 21:07:33 +0100 |
| commit | 2192a6baddd09ae81f86a8bfd5e844086154f5ba (patch) | |
| tree | 334a0c8af8c986be9f89712f2f1fdea3e8b5180c /OpenKeychain | |
| parent | 320f7d35efb059b99b31506426554e9a8f138d8f (diff) | |
| download | open-keychain-2192a6baddd09ae81f86a8bfd5e844086154f5ba.tar.gz open-keychain-2192a6baddd09ae81f86a8bfd5e844086154f5ba.tar.bz2 open-keychain-2192a6baddd09ae81f86a8bfd5e844086154f5ba.zip | |
add more descriptive string about non-mdc encrypted data
Diffstat (limited to 'OpenKeychain')
3 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 771708490..beafdcbb2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -539,6 +539,7 @@ public abstract class OperationResult implements Parcelable { MSG_DC_ERROR_BAD_PASSPHRASE (LogLevel.ERROR, R.string.msg_dc_error_bad_passphrase), MSG_DC_ERROR_EXTRACT_KEY (LogLevel.ERROR, R.string.msg_dc_error_extract_key), MSG_DC_ERROR_INTEGRITY_CHECK (LogLevel.ERROR, R.string.msg_dc_error_integrity_check), + MSG_DC_ERROR_INTEGRITY_MISSING (LogLevel.ERROR, R.string.msg_dc_error_integrity_missing), MSG_DC_ERROR_INVALID_SIGLIST(LogLevel.ERROR, R.string.msg_dc_error_invalid_siglist), MSG_DC_ERROR_IO (LogLevel.ERROR, R.string.msg_dc_error_io), MSG_DC_ERROR_NO_DATA (LogLevel.ERROR, R.string.msg_dc_error_no_data), 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 f5f0ce9a4..b58df085f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -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); } } diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 60b84ea52..16fd2691b 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -890,6 +890,7 @@ <string name="msg_dc_error_bad_passphrase">"Error unlocking key, bad passphrase!"</string> <string name="msg_dc_error_extract_key">"Unknown error unlocking key!"</string> <string name="msg_dc_error_integrity_check">"Integrity check error!"</string> + <string name="msg_dc_error_integrity_missing">"Missing integrity check! This can happen because the encrypting application is out of date, or from a downgrade attack."</string> <string name="msg_dc_error_invalid_siglist">"No valid signature data found!"</string> <string name="msg_dc_error_io">"Encountered IO Exception during operation!"</string> <string name="msg_dc_error_no_data">"No encrypted data found in stream!"</string> |