security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02: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.

* pkclist.c (build_pk_list): Revert last change.  There are too many side
effects for stable.
This commit is contained in:
David Shaw 2003-11-06 05:12:20 +00:00
parent 71e1d13238
commit 96f429ecee
3 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

19
g10/mainproc.c
View file

@ -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)
{