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

gpg: Fix a NULL-deref for invalid input data.

Browse Source 
* g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
entry.
--

GnuPG-bug-id: 1761
Signed-off-by: Werner Koch <wk@gnupg.org>

(backported from commit 32e85668b82f6fbcb824eea9548970804fb41d9e)
This commit is contained in:
Werner Koch 2014-11-24 18:19:31 +01:00
parent a1c861ed38
commit 92a7949ae6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g10/mainproc.c
View File

@ -520,7 +520,9 @@ proc_encrypted( CTX c, PACKET *pkt )
result = -1; result = -1;
else if( !c->dek && !c->last_was_session_key ) { else if( !c->dek && !c->last_was_session_key ) {
int algo; int algo;
STRING2KEY s2kbuf, *s2k = NULL; STRING2KEY s2kbuf;
STRING2KEY *s2k = NULL;
int canceled;
if(opt.override_session_key) if(opt.override_session_key)
{ {
@ -562,9 +564,13 @@ proc_encrypted( CTX c, PACKET *pkt )
log_info (_("assuming %s encrypted data\n"), "IDEA"); log_info (_("assuming %s encrypted data\n"), "IDEA");
} }
c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 3, NULL, NULL ); c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 3, NULL,&canceled);
if (c->dek) if (c->dek)
c->dek->algo_info_printed = 1; c->dek->algo_info_printed = 1;
else if (canceled)
result = gpg_error (GPG_ERR_CANCELED);
else
result = gpg_error (GPG_ERR_INV_PASSPHRASE);
} }
} }
else if( !c->dek ) else if( !c->dek )
@ -585,7 +591,7 @@ proc_encrypted( CTX c, PACKET *pkt )
else if(!opt.no_mdc_warn) else if(!opt.no_mdc_warn)
log_info (_("WARNING: message was not integrity protected\n")); log_info (_("WARNING: message was not integrity protected\n"));
} }
else if( result == G10ERR_BAD_SIGN ) { else if( gpg_err_code (result) == G10ERR_BAD_SIGN ) {
log_error(_("WARNING: encrypted message has been manipulated!\n")); log_error(_("WARNING: encrypted message has been manipulated!\n"));
write_status( STATUS_BADMDC ); write_status( STATUS_BADMDC );
write_status( STATUS_DECRYPTION_FAILED ); write_status( STATUS_DECRYPTION_FAILED );