diff options
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/g10.c | 5 | ||||
| -rw-r--r-- | g10/mainproc.c | 19 |
3 files changed, 23 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index f8a7cbb77..3918b528c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,12 @@ 2003-11-09 David Shaw <[email protected]> + * mainproc.c (proc_symkey_enc): Don't show algorithm information + when --quiet is set. Suggested by Duncan Harris. Also don't fail + with BUG() when processing a --symmetric message with a cipher we + don't have. + + * g10.c: Alias --personal-xxx-prefs to --personal-xxx-preferences. + * pkclist.c (build_pk_list): When adding recipients interactively, allow the user to stop at any point. @@ -630,6 +630,11 @@ static ARGPARSE_OPTS opts[] = { { oPersonalCipherPreferences, "personal-cipher-preferences", 2, "@"}, { oPersonalDigestPreferences, "personal-digest-preferences", 2, "@"}, { oPersonalCompressPreferences, "personal-compress-preferences", 2, "@"}, + /* Aliases. I constantly mistype these, and assume other people + do as well. */ + { oPersonalCipherPreferences, "personal-cipher-prefs", 2, "@"}, + { oPersonalDigestPreferences, "personal-digest-prefs", 2, "@"}, + { oPersonalCompressPreferences, "personal-compress-prefs", 2, "@"}, { oEmuMDEncodeBug, "emulate-md-encode-bug", 0, "@"}, { oDisplay, "display", 2, "@" }, { oTTYname, "ttyname", 2, "@" }, diff --git a/g10/mainproc.c b/g10/mainproc.c index 6fb459608..62881d651 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -292,19 +292,22 @@ proc_symkey_enc( CTX c, PACKET *pkt ) int algo = enc->cipher_algo; const char *s = cipher_algo_to_string (algo); - if( s ) + if(s) { - if(enc->seskeylen) - log_info(_("%s encrypted session key\n"), s ); - else - log_info(_("%s encrypted data\n"), s ); + if(!opt.quiet) + { + if(enc->seskeylen) + log_info(_("%s encrypted session key\n"), s ); + else + log_info(_("%s encrypted data\n"), s ); + } } else - log_info(_("encrypted with unknown algorithm %d\n"), algo ); + log_error(_("encrypted with unknown algorithm %d\n"), algo ); c->last_was_session_key = 2; - if ( opt.list_only ) - goto leave; + if(!s || opt.list_only) + goto leave; c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL, NULL ); if(c->dek) { |