security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-24 15:17:02 +01:00
Code Activity

* mainproc.c (proc_symkey_enc): Don't show algorithm information when

Browse Source 
--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.
This commit is contained in:
David Shaw 2003-11-10 04:33:13 +00:00
parent ebe6f4999f
commit 5028edd538
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,5 +1,12 @@
2003-11-09 David Shaw <dshaw@jabberwocky.com> 2003-11-09 David Shaw <dshaw@jabberwocky.com>
* 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, * pkclist.c (build_pk_list): When adding recipients interactively,
allow the user to stop at any point. allow the user to stop at any point.

5
g10/g10.c
View File

@ -630,6 +630,11 @@ static ARGPARSE_OPTS opts[] = {
{ oPersonalCipherPreferences, "personal-cipher-preferences", 2, "@"}, { oPersonalCipherPreferences, "personal-cipher-preferences", 2, "@"},
{ oPersonalDigestPreferences, "personal-digest-preferences", 2, "@"}, { oPersonalDigestPreferences, "personal-digest-preferences", 2, "@"},
{ oPersonalCompressPreferences, "personal-compress-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, "@"}, { oEmuMDEncodeBug, "emulate-md-encode-bug", 0, "@"},
{ oDisplay, "display", 2, "@" }, { oDisplay, "display", 2, "@" },
{ oTTYname, "ttyname", 2, "@" }, { oTTYname, "ttyname", 2, "@" },

19
g10/mainproc.c
View File

@ -292,19 +292,22 @@ proc_symkey_enc( CTX c, PACKET *pkt )
int algo = enc->cipher_algo; int algo = enc->cipher_algo;
const char *s = cipher_algo_to_string (algo); const char *s = cipher_algo_to_string (algo);
if( s ) if(s)
{ {
if(enc->seskeylen) if(!opt.quiet)
log_info(_("%s encrypted session key\n"), s ); {
else if(enc->seskeylen)
log_info(_("%s encrypted data\n"), s ); log_info(_("%s encrypted session key\n"), s );
else
log_info(_("%s encrypted data\n"), s );
}
} }
else 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; c->last_was_session_key = 2;
if ( opt.list_only ) if(!s || opt.list_only)
goto leave; goto leave;
c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL, NULL ); c->dek = passphrase_to_dek( NULL, 0, algo, &enc->s2k, 0, NULL, NULL );
if(c->dek) if(c->dek)
{ {