gnupg/g10 (ChangeLog keyedit.c keylist.c)
cvs user dshaw
cvs at cvs.gnupg.org
Tue Dec 21 05:14:10 CET 2004
Date: Tuesday, December 21, 2004 @ 05:19:03
Author: dshaw
Path: /cvs/gnupg/gnupg/g10
Modified: ChangeLog keyedit.c keylist.c
* keylist.c (list_keyblock_print): Secret key listings should always show
everything (expired UIDs, revoked subkeys, etc, etc).
* keyedit.c (keyedit_menu): Add additional help for the "sign" flags.
-----------+
ChangeLog | 8 ++++++++
keyedit.c | 37 ++++++++++++++++++++++---------------
keylist.c | 2 +-
3 files changed, 31 insertions(+), 16 deletions(-)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.667 gnupg/g10/ChangeLog:1.668
--- gnupg/g10/ChangeLog:1.667 Mon Dec 20 19:14:57 2004
+++ gnupg/g10/ChangeLog Tue Dec 21 05:19:03 2004
@@ -1,3 +1,11 @@
+2004-12-20 David Shaw <dshaw at jabberwocky.com>
+
+ * keylist.c (list_keyblock_print): Secret key listings should
+ always show everything (expired UIDs, revoked subkeys, etc, etc).
+
+ * keyedit.c (keyedit_menu): Add additional help for the "sign"
+ flags.
+
2004-12-20 Werner Koch <wk at g10code.com>
* keygen.c (ask_expire_interval): For better translations chnage 2
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.164 gnupg/g10/keyedit.c:1.165
--- gnupg/g10/keyedit.c:1.164 Mon Dec 20 06:19:09 2004
+++ gnupg/g10/keyedit.c Tue Dec 21 05:19:03 2004
@@ -1288,14 +1288,14 @@
{ "save" , cmdSAVE , 0, N_("save and quit") },
{ "help" , cmdHELP , 0, N_("show this help") },
{ "?" , cmdHELP , 0, NULL },
- { "fpr" , cmdFPR , 0, N_("show fingerprint") },
+ { "fpr" , cmdFPR , 0, N_("show key fingerprint") },
{ "list" , cmdLIST , 0, N_("list key and user IDs") },
{ "l" , cmdLIST , 0, NULL },
{ "uid" , cmdSELUID , 0, N_("select user ID N") },
{ "key" , cmdSELKEY , 0, N_("select subkey N") },
- { "check" , cmdCHECK , 0, N_("list signatures") },
+ { "check" , cmdCHECK , 0, N_("check signatures") },
{ "c" , cmdCHECK , 0, NULL },
- { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign selected user IDs") },
+ { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign selected user IDs [* see below for related commands]") },
{ "s" , cmdSIGN , KEYEDIT_NOT_SK, NULL },
/* "lsign" will never match since "sign" comes first and it is a
tail match. It is just here so it shows up in the help
@@ -1304,7 +1304,7 @@
{ "debug" , cmdDEBUG , 0, NULL },
{ "adduid" , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") },
{ "addphoto", cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") },
- { "deluid" , cmdDELUID , KEYEDIT_NOT_SK, N_("delete user ID") },
+ { "deluid" , cmdDELUID , KEYEDIT_NOT_SK, N_("delete selected user IDs") },
/* delphoto is really deluid in disguise */
{ "delphoto", cmdDELUID , KEYEDIT_NOT_SK, NULL },
{ "addkey" , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a subkey") },
@@ -1314,29 +1314,29 @@
#endif /*ENABLE_CARD_SUPPORT*/
{ "delkey" , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete selected subkeys") },
{ "addrevoker",cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") },
- { "delsig" , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures") },
- { "expire" , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expiration date") },
- { "primary" , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag a user ID as primary")},
- { "toggle" , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") },
+ { "delsig" , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures from the selected user IDs") },
+ { "expire" , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expiration date for the key or selected subkeys") },
+ { "primary" , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag the selected user ID as primary")},
+ { "toggle" , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between the secret and public key listings") },
{ "t" , cmdTOGGLE , KEYEDIT_NEED_SK, NULL },
{ "pref" , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")},
{ "showpref", cmdSHOWPREF , KEYEDIT_NOT_SK, N_("list preferences (verbose)") },
- { "setpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") },
+ { "setpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list for the selected user IDs") },
/* Alias */
{ "updpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL },
- { "keyserver",cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")},
+ { "keyserver",cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL for the selected user IDs")},
{ "passwd" , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") },
/* Alias */
{ "password", cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL },
{ "trust" , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") },
- { "revsig" , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") },
+ { "revsig" , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures on the selected user IDs") },
{ "revuid" , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke selected user IDs") },
/* Alias */
{ "revphoto", cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL },
- { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke selected subkeys") },
- { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable key") },
+ { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke key or selected subkeys") },
{ "enable" , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable key") },
- { "showphoto",cmdSHOWPHOTO , 0, N_("show photo ID") },
+ { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable key") },
+ { "showphoto",cmdSHOWPHOTO , 0, N_("show selected photo IDs") },
{ NULL, cmdNONE, 0, NULL }
};
enum cmdids cmd = 0;
@@ -1506,8 +1506,15 @@
if((cmds[i].flags & KEYEDIT_NEED_SK) && !sec_keyblock )
; /* skip if we do not have the secret key */
else if( cmds[i].desc )
- tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) );
+ tty_printf("%-11s %s\n", cmds[i].name, _(cmds[i].desc) );
}
+
+ tty_printf("\n");
+ tty_printf(_(
+"* The `sign' command may be prefixed with `l' for local signatures (lsign),\n"
+" a `t' for trust signatures (tsign), a `nr' for non-revocable signatures\n"
+" (nrsign), or any combination thereof (ltsign, tnrsign, etc).\n"));
+
break;
case cmdLIST:
Index: gnupg/g10/keylist.c
diff -u gnupg/g10/keylist.c:1.92 gnupg/g10/keylist.c:1.93
--- gnupg/g10/keylist.c:1.92 Fri Dec 17 19:51:32 2004
+++ gnupg/g10/keylist.c Tue Dec 21 05:19:03 2004
@@ -760,7 +760,7 @@
if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) {
PKT_user_id *uid=node->pkt->pkt.user_id;
- if((uid->is_expired || uid->is_revoked)
+ if(pk && (uid->is_expired || uid->is_revoked)
&& !(opt.list_options&LIST_SHOW_UNUSABLE_UIDS))
{
skip_sigs=1;
More information about the Gnupg-commits
mailing list