security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* options.h, export.c (do_export_stream), keyedit.c (keyedit_menu,

Browse source 
menu_clean_subkeys_from_key), trustdb.h, trustdb.c
(clean_subkeys_from_key): Remove subkey cleaning function.  It is of
very limited usefulness since it cannot be used on any subkey that can
sign, and can only affect multiple selfsigs on encryption-only
subkeys.
This commit is contained in:
David Shaw 2005-06-10 03:00:57 +00:00
parent 31522bac1d
commit 045433e35c
6 changed files with 10 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

38
g10/keyedit.c
View file

@ -53,10 +53,9 @@ static void show_key_with_all_names( KBNODE keyblock, int only_marked,
static void show_key_and_fingerprint( KBNODE keyblock );
static int menu_adduid( KBNODE keyblock, KBNODE sec_keyblock, int photo );
static void menu_deluid( KBNODE pub_keyblock, KBNODE sec_keyblock );
static int menu_delsig( KBNODE pub_keyblock );
static int menu_delsig( KBNODE pub_keyblock );
static int menu_clean_sigs_from_uids(KBNODE keyblock);
static int menu_clean_uids_from_key(KBNODE keyblock);
static int menu_clean_subkeys_from_key(KBNODE keyblock);
static void menu_delkey( KBNODE pub_keyblock, KBNODE sec_keyblock );
static int menu_addrevoker( KBNODE pub_keyblock,
KBNODE sec_keyblock, int sensitive );
@ -2149,8 +2148,6 @@ keyedit_menu( const char *username, STRLIST locusr,
modified=menu_clean_sigs_from_uids(keyblock);
else if(ascii_strcasecmp(arg_string,"uids")==0)
redisplay=modified=menu_clean_uids_from_key(keyblock);
else if(ascii_strcasecmp(arg_string,"subkeys")==0)
redisplay=modified=menu_clean_subkeys_from_key(keyblock);
else
tty_printf("Unable to clean `%s'\n",arg_string);
}
@ -2158,7 +2155,6 @@ keyedit_menu( const char *username, STRLIST locusr,
{
modified=menu_clean_sigs_from_uids(keyblock);
modified+=menu_clean_uids_from_key(keyblock);
modified+=menu_clean_subkeys_from_key(keyblock);
redisplay=modified;
}
}
@ -3223,38 +3219,6 @@ menu_clean_uids_from_key(KBNODE keyblock)
return modified;
}
static int
menu_clean_subkeys_from_key(KBNODE keyblock)
{
KBNODE node;
int modified=clean_subkeys_from_key(keyblock,0);
if(modified)
{
for(node=keyblock->next;node;node=node->next)
{
if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY && is_deleted_kbnode(node))
{
const char *reason;
if(node->pkt->pkt.public_key->is_revoked)
reason=_("revoked");
else if(node->pkt->pkt.public_key->has_expired)
reason=_("expired");
else
reason=_("invalid");
tty_printf("Subkey %s removed: %s\n",
keystr(node->pkt->pkt.public_key->keyid),reason);
}
}
}
else
tty_printf("No subkeys are removable.\n");
return modified;
}
/****************
* Remove some of the secondary keys
*/