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

* trustdb.h, trustdb.c (register_trusted_keyid): New. Adds a keyid to the

Browse source 
list of ultimately trusted keys.

* keygen.c (do_generate_keypair): Use it here so that the ultimate
ownertrust happens before the trustdb (might be) rebuilt.  Also fix an
error where the newly generated pk is thought to be a subkey by the
trustdb.

* g10.c (main): Fix --export-all do actually do something different than
--export.

* pkclist.c (build_pk_list): Show all recipients rather than showing each
recipient as they are added.

* mainproc.c (proc_symkey_enc, proc_encrypted): Keep a count of the number
of passphrases that can decrypt a symmetric or mixed symmetric/pk message
and include it in the list of keys shown to the user.
This commit is contained in:
David Shaw 2003-11-01 01:13:16 +00:00
parent d3cd27c3b6
commit 5c37fd90bf
7 changed files with 94 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

13
g10/mainproc.c
View file

@ -50,7 +50,6 @@ struct kidlist_item {
};
/****************
* Structure to hold the context
*/
@ -72,6 +71,7 @@ struct mainproc_context {
IOBUF iobuf; /* used to get the filename etc. */
int trustletter; /* temp usage in list_node */
ulong local_id; /* ditto */
ulong symkeys;
struct kidlist_item *pkenc_list; /* list of encryption packets */
struct {
int op;
@ -327,7 +327,9 @@ proc_symkey_enc( CTX c, PACKET *pkt )
c->dek->algo_info_printed = 1;
}
}
leave:
c->symkeys++;
free_packet(pkt);
}
@ -477,10 +479,15 @@ proc_encrypted( CTX c, PACKET *pkt )
{
int result = 0;
if (!opt.quiet) {
if (!opt.quiet)
{
if(c->symkeys>1)
log_info(_("encrypted with %lu passphrases\n"),c->symkeys);
else if(c->symkeys==1)
log_info(_("encrypted with 1 passphrase\n"));
print_pkenc_list ( c->pkenc_list, 1 );
print_pkenc_list ( c->pkenc_list, 0 );
}
}
write_status( STATUS_BEGIN_DECRYPTION );