security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

gpg: Emit an ERROR status as hint for a bad passphrase.

Browse Source 
* g10/mainproc.c (proc_symkey_enc): Issue new error code.
(proc_encrypted): Ditto.
--

This allows GPGME to return a better error message than "bad session
key" to the user.  Technically we could get run into these errors also
in other cases but this more unlikley.  For the command line use we
don't do anything to not change the expected output of the command
line interface.

GnuPG-bug-id: 5943
This commit is contained in:
Werner Koch 2022-04-25 11:18:40 +02:00
parent 2fc91e15c6
commit 0f8623d518
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
g10/mainproc.c
View File

@ -437,6 +437,11 @@ proc_symkey_enc (CTX c, PACKET *pkt)
&& gpg_err_code (err) != GPG_ERR_CHECKSUM) && gpg_err_code (err) != GPG_ERR_CHECKSUM)
log_fatal ("process terminated to be bug compatible" log_fatal ("process terminated to be bug compatible"
" with GnuPG <= 2.2\n"); " with GnuPG <= 2.2\n");
else
write_status_text (STATUS_ERROR,
"symkey_decrypt.maybe_error"
" 11_BAD_PASSPHRASE");
if (c->dek->s2k_cacheid[0]) if (c->dek->s2k_cacheid[0])
{ {
if (opt.debug) if (opt.debug)
@ -805,15 +810,22 @@ proc_encrypted (CTX c, PACKET *pkt)
} }
else else
{ {
if ((gpg_err_code (result) == GPG_ERR_BAD_KEY if (gpg_err_code (result) == GPG_ERR_BAD_KEY
|| gpg_err_code (result) == GPG_ERR_CHECKSUM || gpg_err_code (result) == GPG_ERR_CHECKSUM
|| gpg_err_code (result) == GPG_ERR_CIPHER_ALGO) || gpg_err_code (result) == GPG_ERR_CIPHER_ALGO)
&& c->dek && *c->dek->s2k_cacheid != '\0')
{ {
if (opt.debug) if (c->symkeys)
log_debug ("cleared passphrase cached with ID: %s\n", write_status_text (STATUS_ERROR,
c->dek->s2k_cacheid); "symkey_decrypt.maybe_error"
passphrase_clear_cache (c->dek->s2k_cacheid); " 11_BAD_PASSPHRASE");
if (c->dek && *c->dek->s2k_cacheid != '\0')
{
if (opt.debug)
log_debug ("cleared passphrase cached with ID: %s\n",
c->dek->s2k_cacheid);
passphrase_clear_cache (c->dek->s2k_cacheid);
}
} }
glo_ctrl.lasterr = result; glo_ctrl.lasterr = result;
write_status (STATUS_DECRYPTION_FAILED); write_status (STATUS_DECRYPTION_FAILED);