mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Add KEYEXPIRED, EXPSIG, and EXPKEYSIG. Add
"deprecated-use-keyexpired-instead" to SIGEXPIRED. Start transition from SIGEXPIRED to KEYEXPIRED, since the actual event is signature verification by an expired key and not an expired signature. Rename do_signature_check as signature_check2, make public, and change all callers. Use status EXPSIG for an expired, but good, signature. Add the expiration time (or 0) to the VALIDSIG status line. Use status KEYEXPSIG for a good signature from an expired key. Remove checks for no arguments now that argparse does it.
This commit is contained in:
parent
2ad36cb4f2
commit
d367d40e47
7 changed files with 80 additions and 43 deletions
24
g10/g10.c
24
g10/g10.c
|
@ -1191,25 +1191,23 @@ main( int argc, char **argv )
|
|||
#endif /* __riscos__ */
|
||||
break;
|
||||
case oKeyServer:
|
||||
if(pargs.r.ret_str==NULL || parse_keyserver_uri(pargs.r.ret_str))
|
||||
if(parse_keyserver_uri(pargs.r.ret_str))
|
||||
log_error(_("could not parse keyserver URI\n"));
|
||||
break;
|
||||
case oKeyServerOptions:
|
||||
if(pargs.r.ret_str)
|
||||
parse_keyserver_options(pargs.r.ret_str);
|
||||
parse_keyserver_options(pargs.r.ret_str);
|
||||
break;
|
||||
case oTempDir: opt.temp_dir=pargs.r.ret_str; break;
|
||||
case oExecPath:
|
||||
if(pargs.r.ret_str)
|
||||
{
|
||||
/* Notice that path is never freed. That is
|
||||
intentional due to the way putenv() works. */
|
||||
char *path=m_alloc(5+strlen(pargs.r.ret_str)+1);
|
||||
strcpy(path,"PATH=");
|
||||
strcat(path,pargs.r.ret_str);
|
||||
if(putenv(path)!=0)
|
||||
log_error(_("unable to set exec-path to %s\n"),path);
|
||||
}
|
||||
{
|
||||
/* Notice that path is never freed. That is
|
||||
intentional due to the way putenv() works. */
|
||||
char *path=m_alloc(5+strlen(pargs.r.ret_str)+1);
|
||||
strcpy(path,"PATH=");
|
||||
strcat(path,pargs.r.ret_str);
|
||||
if(putenv(path)!=0)
|
||||
log_error(_("unable to set exec-path to %s\n"),path);
|
||||
}
|
||||
break;
|
||||
case oNotation: add_notation_data( pargs.r.ret_str ); break;
|
||||
case oShowNotation: opt.show_notation=1; break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue