diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/mainproc.c | 17 |
2 files changed, 21 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index bea12dac7..875538b8d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2005-09-20 Werner Koch <[email protected]> + + * mainproc.c (proc_symkey_enc): Take care of a canceled passphrase + prompt. + 2005-09-19 David Shaw <[email protected]> * keylist.c (reorder_keyblock, do_reorder_keyblock): Reorder diff --git a/g10/mainproc.c b/g10/mainproc.c index 438543df1..7c1392160 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -327,7 +327,22 @@ proc_symkey_enc( CTX c, PACKET *pkt ) } else { - c->dek=passphrase_to_dek(NULL, 0, algo, &enc->s2k, 0, NULL, NULL); + int canceled; + + c->dek = passphrase_to_dek (NULL, 0, algo, &enc->s2k, 0, + NULL, &canceled); + if (canceled) + { + /* For unknown reasons passphrase_to_dek does only + return NULL if a new passphrase has been requested + and has not been repeated correctly. Thus even + with a cancel requested (by means of the gpg-agent) + it won't return NULL but an empty passphrase. We + take the most conservative approach for now and + work around it right here. */ + xfree (c->dek); + c->dek = NULL; + } if(c->dek) { |