diff options
| author | Timo Schulz <[email protected]> | 2002-05-05 15:50:44 +0000 |
|---|---|---|
| committer | Timo Schulz <[email protected]> | 2002-05-05 15:50:44 +0000 |
| commit | f6ccde9f1468209abbd26053f0d0bd09bf2327ea (patch) | |
| tree | 3dd3a1751242340902f969c70289ca7a9cecefd5 | |
| parent | * keyserver.c (keyserver_refresh): --refresh-keys implies --merge-only so (diff) | |
| download | gnupg-f6ccde9f1468209abbd26053f0d0bd09bf2327ea.tar.gz gnupg-f6ccde9f1468209abbd26053f0d0bd09bf2327ea.zip | |
2002-05-04 Timo Schulz <[email protected]>
* mainproc.c (proc_symkey_enc): Don't ask for a passphrase
in the list only mode.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/mainproc.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 2dafe2d15..6c5d957d2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2002-05-05 Timo Schulz <[email protected]> + + * mainproc.c (proc_symkey_enc): Don't ask for a passphrase + in the list only mode. + 2002-05-05 David Shaw <[email protected]> * keyserver.c (keyserver_refresh): --refresh-keys implies diff --git a/g10/mainproc.c b/g10/mainproc.c index 9bd8a0a3d..7439e43dc 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -257,10 +257,13 @@ proc_symkey_enc( CTX c, PACKET *pkt ) log_info(_("encrypted with unknown algorithm %d\n"), algo ); c->last_was_session_key = 2; + if ( opt.list_only ) + goto leave; c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL ); if (c->dek) c->dek->algo_info_printed = 1; } +leave: free_packet(pkt); } |