diff options
| author | Werner Koch <[email protected]> | 2014-11-24 17:19:31 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-11-24 18:27:20 +0000 |
| commit | 92a7949ae6331b5e188480b76ce29a86ede6e89e (patch) | |
| tree | cdcbcae731909f87d98d189509e5cd6c8983ac90 | |
| parent | po: Update Japanese translation. (diff) | |
| download | gnupg-92a7949ae6331b5e188480b76ce29a86ede6e89e.tar.gz gnupg-92a7949ae6331b5e188480b76ce29a86ede6e89e.zip | |
gpg: Fix a NULL-deref for invalid input data.
* g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
entry.
--
GnuPG-bug-id: 1761
Signed-off-by: Werner Koch <[email protected]>
(backported from commit 32e85668b82f6fbcb824eea9548970804fb41d9e)
| -rw-r--r-- | g10/mainproc.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 3abcb1502..6288030b0 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -520,7 +520,9 @@ proc_encrypted( CTX c, PACKET *pkt ) result = -1; else if( !c->dek && !c->last_was_session_key ) { int algo; - STRING2KEY s2kbuf, *s2k = NULL; + STRING2KEY s2kbuf; + STRING2KEY *s2k = NULL; + int canceled; if(opt.override_session_key) { @@ -562,9 +564,13 @@ proc_encrypted( CTX c, PACKET *pkt ) 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) 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 ) @@ -585,7 +591,7 @@ proc_encrypted( CTX c, PACKET *pkt ) else if(!opt.no_mdc_warn) 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")); write_status( STATUS_BADMDC ); write_status( STATUS_DECRYPTION_FAILED ); |