mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Print keyid in gpg --list-packets.
Add some not yet code to app-nks.c Changed batch mode expiration time computation
This commit is contained in:
parent
dcc0907793
commit
a766a37290
6 changed files with 121 additions and 5 deletions
|
@ -1799,13 +1799,17 @@ parse_expire_string( const char *string )
|
|||
u32 seconds;
|
||||
u32 abs_date = 0;
|
||||
u32 curtime = make_timestamp ();
|
||||
time_t tt;
|
||||
|
||||
if (!*string)
|
||||
seconds = 0;
|
||||
else if (!strncmp (string, "seconds=", 8))
|
||||
seconds = atoi (string+8);
|
||||
else if ((abs_date = scan_isodatestr(string)) && abs_date > curtime)
|
||||
seconds = abs_date - curtime;
|
||||
else if ((abs_date = scan_isodatestr(string))
|
||||
&& (abs_date+86400/2) > curtime)
|
||||
seconds = (abs_date+86400/2) - curtime;
|
||||
else if ((tt = isotime2epoch (string)) != (time_t)(-1))
|
||||
seconds = (u32)tt - curtime;
|
||||
else if ((mult = check_valid_days (string)))
|
||||
seconds = atoi (string) * 86400L * mult;
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue