security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-21 21:39:58 +01:00
Code Activity

* options.h, g10.c (main), keylist.c (list_keyblock_print), keyedit.c

Browse Source 
(print_and_check_one_sig): New "show-sig-expire" list-option to show
signature expiration dates (if any).
This commit is contained in:
David Shaw 2003-08-03 02:37:48 +00:00
parent 7921516e85
commit 752e3459ab
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2003-08-02 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main), keylist.c (list_keyblock_print),
keyedit.c (print_and_check_one_sig): New "show-sig-expire"
list-option to show signature expiration dates (if any).
2003-07-24 David Shaw <dshaw@jabberwocky.com> 2003-07-24 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main, add_keyserver_url): Add * options.h, g10.c (main, add_keyserver_url): Add

1
g10/g10.c
View File

@ -1764,6 +1764,7 @@ main( int argc, char **argv )
{"show-keyring",LIST_SHOW_KEYRING}, {"show-keyring",LIST_SHOW_KEYRING},
{"show-validity",LIST_SHOW_VALIDITY}, {"show-validity",LIST_SHOW_VALIDITY},
{"show-long-keyid",LIST_SHOW_LONG_KEYID}, {"show-long-keyid",LIST_SHOW_LONG_KEYID},
{"show-sig-expire",LIST_SHOW_SIG_EXPIRE},
{NULL,0} {NULL,0}
}; };

5
g10/keyedit.c
View File

@ -133,7 +133,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
break; break;
} }
if( sigrc != '?' || print_without_key ) { if( sigrc != '?' || print_without_key ) {
tty_printf("%s%c%c %c%c%c%c%c%c %08lX %s ", tty_printf("%s%c%c %c%c%c%c%c%c %08lX %s",
is_rev? "rev":"sig",sigrc, is_rev? "rev":"sig",sigrc,
(sig->sig_class-0x10>0 && (sig->sig_class-0x10>0 &&
sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ', sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ',
@ -145,6 +145,9 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
(sig->trust_depth>9)?'T': (sig->trust_depth>9)?'T':
(sig->trust_depth>0)?'0'+sig->trust_depth:' ', (sig->trust_depth>0)?'0'+sig->trust_depth:' ',
(ulong)sig->keyid[1], datestr_from_sig(sig)); (ulong)sig->keyid[1], datestr_from_sig(sig));
if(opt.list_options&LIST_SHOW_SIG_EXPIRE)
tty_printf(" %s",expirestr_from_sig(sig));
tty_printf(" ");
if( sigrc == '%' ) if( sigrc == '%' )
tty_printf("[%s] ", g10_errstr(rc) ); tty_printf("[%s] ", g10_errstr(rc) );
else if( sigrc == '?' ) else if( sigrc == '?' )

5
g10/keylist.c
View File

@ -823,7 +823,10 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
printf("%08lX%08lX",(ulong)sig->keyid[0],(ulong)sig->keyid[1]); printf("%08lX%08lX",(ulong)sig->keyid[0],(ulong)sig->keyid[1]);
else else
printf("%08lX",(ulong)sig->keyid[1]); printf("%08lX",(ulong)sig->keyid[1]);
printf(" %s ", datestr_from_sig(sig)); printf(" %s", datestr_from_sig(sig));
if(opt.list_options&LIST_SHOW_SIG_EXPIRE)
printf(" %s", expirestr_from_sig(sig));
printf(" ");
if( sigrc == '%' ) if( sigrc == '%' )
printf("[%s] ", g10_errstr(rc) ); printf("[%s] ", g10_errstr(rc) );
else if( sigrc == '?' ) else if( sigrc == '?' )

1
g10/options.h
View File

@ -234,6 +234,7 @@ struct {
#define LIST_SHOW_KEYRING 8 #define LIST_SHOW_KEYRING 8
#define LIST_SHOW_VALIDITY 16 #define LIST_SHOW_VALIDITY 16
#define LIST_SHOW_LONG_KEYID 32 #define LIST_SHOW_LONG_KEYID 32
#define LIST_SHOW_SIG_EXPIRE 64
#define VERIFY_SHOW_PHOTOS 1 #define VERIFY_SHOW_PHOTOS 1
#define VERIFY_SHOW_POLICY 2 #define VERIFY_SHOW_POLICY 2