security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: Don't try decryption by session key when NULL.

Browse Source 
* g10/mainproc.c (proc_encrypted): Only call get_session_key when
PKENC_LIST is not NULL.
Return GPG_ERR_BAD_KEY, instead of GPG_ERR_NO_SECKEY, when
it's encrypted only by symmetric key.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-07-12 09:26:00 +09:00
parent 02d8b38383
commit 89303b9998
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/mainproc.c
View File

@ -574,7 +574,7 @@ proc_encrypted (CTX c, PACKET *pkt)
write_status_error ("pkdecrypt_failed", result); write_status_error ("pkdecrypt_failed", result);
} }
} }
else else if (c->pkenc_list)
{ {
c->dek = xmalloc_secure_clear (sizeof *c->dek); c->dek = xmalloc_secure_clear (sizeof *c->dek);
result = get_session_key (c->ctrl, c->pkenc_list, c->dek); result = get_session_key (c->ctrl, c->pkenc_list, c->dek);
@ -669,8 +669,11 @@ proc_encrypted (CTX c, PACKET *pkt)
} }
else if (!c->dek) else if (!c->dek)
{ {
if (c->symkeys && !c->pkenc_list)
result = gpg_error (GPG_ERR_BAD_KEY);
if (!result) if (!result)
result = GPG_ERR_NO_SECKEY; result = gpg_error (GPG_ERR_NO_SECKEY);
} }
/* Compute compliance with CO_DE_VS. */ /* Compute compliance with CO_DE_VS. */
@ -783,7 +786,7 @@ proc_encrypted (CTX c, PACKET *pkt)
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->s2k_cacheid != '\0') && c->dek && *c->dek->s2k_cacheid != '\0')
{ {
if (opt.debug) if (opt.debug)
log_debug ("cleared passphrase cached with ID: %s\n", log_debug ("cleared passphrase cached with ID: %s\n",