security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-23 15:07:03 +01:00
Code Activity

gpg: Clear the symmetric passphrase cache for encrypted session keys.

Browse Source 
* g10/mainproc.c (proc_symkey_enc): Clear the symmetric key cache on
error.
(proc_encrypted): Need to take are of the checksum error.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-01-23 11:54:02 +01:00
parent 9aab9167bc
commit 278d874656
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g10/mainproc.c
View File

@ -252,7 +252,6 @@ symkey_decrypt_seskey (DEK *dek, byte *seskey, size_t slen)
gcry_cipher_hd_t hd; gcry_cipher_hd_t hd;
unsigned int noncelen, keylen; unsigned int noncelen, keylen;
enum gcry_cipher_modes ciphermode; enum gcry_cipher_modes ciphermode;
byte ad[4];
if (dek->use_aead) if (dek->use_aead)
{ {
@ -410,9 +409,17 @@ proc_symkey_enc (CTX c, PACKET *pkt)
log_info ("decryption of the symmetrically encrypted" log_info ("decryption of the symmetrically encrypted"
" session key failed: %s\n", " session key failed: %s\n",
gpg_strerror (err)); gpg_strerror (err));
if (gpg_err_code (err) != GPG_ERR_BAD_KEY) if (gpg_err_code (err) != GPG_ERR_BAD_KEY
&& 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");
if (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);
}
xfree (c->dek); xfree (c->dek);
c->dek = NULL; c->dek = NULL;
} }
@ -757,6 +764,7 @@ 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_CIPHER_ALGO) || gpg_err_code (result) == GPG_ERR_CIPHER_ALGO)
&& *c->dek->s2k_cacheid != '\0') && *c->dek->s2k_cacheid != '\0')
{ {