aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-05-14 06:49:37 +0000
committerWerner Koch <[email protected]>2014-05-14 06:56:36 +0000
commitb2945c451d3d3f25ba11a9fe88c6cbf3f88c2fb5 (patch)
tree31cb5fd618fad1f2613ffdd38aa471e7b74c3e4e
parentagent: Fix import of non-protected gpg keys. (diff)
downloadgnupg-b2945c451d3d3f25ba11a9fe88c6cbf3f88c2fb5.tar.gz
gnupg-b2945c451d3d3f25ba11a9fe88c6cbf3f88c2fb5.zip
gpg: Fix glitch entering a full expiration time.
* g10/keygen.c (ask_expire_interval): Get the current time after the prompt. -- This almost avoid that an entered full ISO timestamp is not used as given but off by the time the user required to enter the timestamp. GnuPG-bug-id: 1639
Diffstat (limited to '')
-rw-r--r--g10/keygen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/keygen.c b/g10/keygen.c
index 314cf9bab..0c954356e 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2302,7 +2302,7 @@ ask_expire_interval(int object,const char *def_expire)
answer = NULL;
for(;;)
{
- u32 curtime=make_timestamp();
+ u32 curtime;
xfree(answer);
if(object==0)
@@ -2326,6 +2326,7 @@ ask_expire_interval(int object,const char *def_expire)
}
cpr_kill_prompt();
trim_spaces(answer);
+ curtime = make_timestamp ();
interval = parse_expire_string( answer );
if( interval == (u32)-1 )
{