security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: Fix expiration time when Creation-Date is specified.

Browse Source 
* g10/keygen.c (parse_expire_string_with_ct): New function, optionally
supply the creation time.
(parse_expire_string): Use parse_expire_string_with_ct with no
creation time.
(proc_parameter_file): Use parse_expire_string_with_ct possibly with
the creation time.

--

GnuPG-bug-id: 5252
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-07-12 13:34:19 +09:00
parent 067bc2ed4c
commit b07b5144ff
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
g10/keygen.c
View File

@ -2740,14 +2740,19 @@ ask_curve (int *algo, int *subkey_algo, const char *current)
* just cope for the next few years until we get a 64-bit time_t or * just cope for the next few years until we get a 64-bit time_t or
* similar. * similar.
*/ */
u32 static u32
parse_expire_string( const char *string ) parse_expire_string_with_ct (const char *string, u32 creation_time)
{ {
int mult; int mult;
u32 seconds; u32 seconds;
u32 abs_date = 0; u32 abs_date = 0;
u32 curtime = make_timestamp ();
time_t tt; time_t tt;
u32 curtime;
if (creation_time == (u32)-1)
curtime = make_timestamp ();
else
curtime = creation_time;
if (!string || !*string || !strcmp (string, "none") if (!string || !*string || !strcmp (string, "none")
|| !strcmp (string, "never") || !strcmp (string, "-")) || !strcmp (string, "never") || !strcmp (string, "-"))
@ -2767,6 +2772,13 @@ parse_expire_string( const char *string )
return seconds; return seconds;
} }
u32
parse_expire_string ( const char *string )
{
return parse_expire_string_with_ct (string, (u32)-1);
}
/* Parse a Creation-Date string which is either "1986-04-26" or /* Parse a Creation-Date string which is either "1986-04-26" or
"19860426T042640". Returns 0 on error. */ "19860426T042640". Returns 0 on error. */
static u32 static u32
@ -4157,6 +4169,7 @@ proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname,
int is_default = 0; int is_default = 0;
int have_user_id = 0; int have_user_id = 0;
int err, algo; int err, algo;
u32 creation_time = (u32)-1;
/* Check that we have all required parameters. */ /* Check that we have all required parameters. */
r = get_parameter( para, pKEYTYPE ); r = get_parameter( para, pKEYTYPE );
@ -4322,15 +4335,13 @@ proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname,
if (r && *r->u.value && !(get_parameter_bool (para, pCARDKEY) if (r && *r->u.value && !(get_parameter_bool (para, pCARDKEY)
&& get_parameter_u32 (para, pKEYCREATIONDATE))) && get_parameter_u32 (para, pKEYCREATIONDATE)))
{ {
u32 seconds; creation_time = parse_creation_string (r->u.value);
if (!creation_time)
seconds = parse_creation_string (r->u.value);
if (!seconds)
{ {
log_error ("%s:%d: invalid creation date\n", fname, r->lnr ); log_error ("%s:%d: invalid creation date\n", fname, r->lnr );
return -1; return -1;
} }
r->u.creation = seconds; r->u.creation = creation_time;
r->key = pKEYCREATIONDATE; /* Change that entry. */ r->key = pKEYCREATIONDATE; /* Change that entry. */
} }
@ -4340,7 +4351,7 @@ proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname,
{ {
u32 seconds; u32 seconds;
seconds = parse_expire_string( r->u.value ); seconds = parse_expire_string_with_ct (r->u.value, creation_time);
if( seconds == (u32)-1 ) if( seconds == (u32)-1 )
{ {
log_error("%s:%d: invalid expire date\n", fname, r->lnr ); log_error("%s:%d: invalid expire date\n", fname, r->lnr );