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

* main.h, keygen.c (ask_expire_interval, parse_expire_string): Pass in

Browse source 
the time to use to calculate the expiration offset, rather than
querying it internally.  Change all callers.
This commit is contained in:
David Shaw 2007-02-01 19:32:16 +00:00
parent 67c18b8c3c
commit ef8f2e2f6f
6 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
g10/sign.c
View file

@ -775,9 +775,9 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
if(!opt.force_v3_sigs && !RFC1991)
{
if(opt.ask_sig_expire && !opt.batch)
duration=ask_expire_interval(1,opt.def_sig_expire);
duration=ask_expire_interval(create_time,1,opt.def_sig_expire);
else
duration=parse_expire_string(opt.def_sig_expire);
duration=parse_expire_string(create_time,opt.def_sig_expire);
}
if( (rc=build_sk_list( locusr, &sk_list, 1, PUBKEY_USAGE_SIG )) )
@ -1085,9 +1085,9 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
if(!opt.force_v3_sigs && !RFC1991)
{
if(opt.ask_sig_expire && !opt.batch)
duration=ask_expire_interval(1,opt.def_sig_expire);
duration=ask_expire_interval(create_time,1,opt.def_sig_expire);
else
duration=parse_expire_string(opt.def_sig_expire);
duration=parse_expire_string(create_time,opt.def_sig_expire);
}
if( (rc=build_sk_list( locusr, &sk_list, 1, PUBKEY_USAGE_SIG )) )
@ -1245,9 +1245,9 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
if(!opt.force_v3_sigs && !RFC1991)
{
if(opt.ask_sig_expire && !opt.batch)
duration=ask_expire_interval(1,opt.def_sig_expire);
duration=ask_expire_interval(create_time,1,opt.def_sig_expire);
else
duration=parse_expire_string(opt.def_sig_expire);
duration=parse_expire_string(create_time,opt.def_sig_expire);
}
rc = build_sk_list (locusr, &sk_list, 1, PUBKEY_USAGE_SIG);