security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-05 12:31:50 +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.

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/ChangeLog
View File

@ -1,3 +1,13 @@
2003-11-05 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.
* pkclist.c (build_pk_list): Revert last change. There are too
many side effects for stable.
2003-10-31 David Shaw <dshaw@jabberwocky.com> 2003-10-31 David Shaw <dshaw@jabberwocky.com>
* pkclist.c (build_pk_list): Show all recipients rather than * pkclist.c (build_pk_list): Show all recipients rather than

9
g10/mainproc.c
View File

@ -292,18 +292,21 @@ 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(!opt.quiet)
{ {
if(enc->seskeylen) if(enc->seskeylen)
log_info(_("%s encrypted session key\n"), s ); log_info(_("%s encrypted session key\n"), s );
else else
log_info(_("%s encrypted data\n"), s ); 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)

51
g10/pkclist.c
View File

@ -857,36 +857,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
else if(backlog) { else if(backlog) {
answer=pop_strlist(&backlog); answer=pop_strlist(&backlog);
} }
else else {
{
PK_LIST iter;
tty_printf("\n");
tty_printf(_("Current recipients:\n"));
for(iter=pk_list;iter;iter=iter->next)
{
u32 keyid[2];
keyid_from_pk(iter->pk,keyid);
tty_printf("%4u%c/%08lX %s \"",
nbits_from_pk(iter->pk),
pubkey_letter(iter->pk->pubkey_algo),
(ulong)keyid[1],
datestr_from_pk(iter->pk));
if(iter->pk->user_id)
tty_print_utf8_string(iter->pk->user_id->name,
iter->pk->user_id->len);
else
{
size_t n;
char *p = get_user_id( keyid, &n );
tty_print_utf8_string( p, n );
m_free(p);
}
tty_printf("\"\n");
}
answer = cpr_get_utf8("pklist.user_id.enter", answer = cpr_get_utf8("pklist.user_id.enter",
_("\nEnter the user ID. End with an empty line: ")); _("\nEnter the user ID. End with an empty line: "));
trim_spaces(answer); trim_spaces(answer);
@ -938,6 +909,26 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
} }
else { else {
PK_LIST r; PK_LIST r;
u32 keyid[2];
keyid_from_pk( pk, keyid);
tty_printf("Added %4u%c/%08lX %s \"",
nbits_from_pk( pk ),
pubkey_letter( pk->pubkey_algo ),
(ulong)keyid[1],
datestr_from_pk( pk ) );
if(pk->user_id)
tty_print_utf8_string(pk->user_id->name,
pk->user_id->len);
else
{
size_t n;
char *p = get_user_id( keyid, &n );
tty_print_utf8_string( p, n );
m_free(p);
}
tty_printf("\"\n");
r = m_alloc( sizeof *r ); r = m_alloc( sizeof *r );
r->pk = pk; pk = NULL; r->pk = pk; pk = NULL;
r->next = pk_list; r->next = pk_list;