security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* keygen.c (keygen_add_key_expire): Properly handle updating a key

Browse Source 
expiration to a no-expiration value.

* keyedit.c (enable_disable_key): Comment.

* import.c (import_one): When in interactive mode and --verbose, don't
repeat some key information twice.
This commit is contained in:
David Shaw 2002-12-26 22:00:44 +00:00
parent ad79ac8a80
commit b8068e84e7
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/ChangeLog
View File

@ -1,3 +1,13 @@
2002-12-26 David Shaw <dshaw@jabberwocky.com>
* keygen.c (keygen_add_key_expire): Properly handle updating a key
expiration to a no-expiration value.
* keyedit.c (enable_disable_key): Comment.
* import.c (import_one): When in interactive mode and --verbose,
don't repeat some key information twice.
2002-12-23 Timo Schulz <ts@winpt.org>
* import.c (import_one): Use merge_keys_and_selfsig in the

2
g10/import.c
View File

@ -575,7 +575,7 @@ import_one( const char *fname, KBNODE keyblock, int fast,
log_info(_("NOTE: Elgamal primary key detected - "
"this may take some time to import\n"));
if( opt.verbose ) {
if( opt.verbose && !opt.interactive ) {
log_info( "pub %4u%c/%08lX %s ",
nbits_from_pk( pk ),
pubkey_letter( pk->pubkey_algo ),

5
g10/keyedit.c
View File

@ -3208,7 +3208,10 @@ menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock )
return changed;
}
/* Note that update_ownertrust is going to mark the trustdb dirty when
enabling or disabling a key. This is arguably sub-optimal as
disabled keys are still counted in the web of trust, but perhaps
not worth adding extra complexity to change. -ds */
static int
enable_disable_key( KBNODE keyblock, int disable )
{

6
g10/keygen.c
View File

@ -163,6 +163,12 @@ keygen_add_key_expire( PKT_signature *sig, void *opaque )
buf[3] = u & 0xff;
build_sig_subpkt( sig, SIGSUBPKT_KEY_EXPIRE, buf, 4 );
}
else
{
/* Make sure we don't leave a key expiration subpacket lying
around */
delete_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE);
}
return 0;
}