security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-07 17:33:02 +01:00
Code Activity

gpg: Print a hint on how to decrypt a non-mdc message anyway.

Browse Source 
* g10/mainproc.c (proc_encrypted): Print a hint for legacy ciphers w/o
MDC.  Also print a dedicated status error code

Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 874e391665405fc413a69f2ffacdb94bb08da7ff)
This commit is contained in:
Werner Koch 2018-05-31 12:59:40 +02:00
parent 2f2b1d1da9
commit 825909e9cd
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
g10/mainproc.c
View File

@ -662,8 +662,25 @@ proc_encrypted (CTX c, PACKET *pkt)
* avoid attacks changing an MDC message to a non-MDC message, * avoid attacks changing an MDC message to a non-MDC message,
* we fail here. */ * we fail here. */
log_error (_("WARNING: message was not integrity protected\n")); log_error (_("WARNING: message was not integrity protected\n"));
if (opt.verbose > 1) if (!pkt->pkt.encrypted->mdc_method
log_info ("decryption forced to fail\n"); && (openpgp_cipher_get_algo_blklen (c->dek->algo) == 8
|| c->dek->algo == CIPHER_ALGO_TWOFISH))
{
/* Before 2.2.8 we did not fail hard for a missing MDC if
* one of the old ciphers where used. Although these cases
* are rare in practice we print a hint on how to decrypt
* such messages. */
log_string
(GPGRT_LOGLVL_INFO,
_("Hint: If this message was created before the year 2003 it is\n"
"likely that this message is legitimate. This is because back\n"
"then integrity protection was not widely used.\n"));
log_info (_("Use the option '%s' to decrypt anyway.\n"),
"--ignore-mdc-error");
write_status_errcode ("nomdc_with_legacy_cipher",
GPG_ERR_DECRYPT_FAILED);
}
log_info (_("decryption forced to fail!\n"));
write_status (STATUS_DECRYPTION_FAILED); write_status (STATUS_DECRYPTION_FAILED);
} }
else if (!result || (gpg_err_code (result) == GPG_ERR_BAD_SIGNATURE else if (!result || (gpg_err_code (result) == GPG_ERR_BAD_SIGNATURE