generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix opt_imax() call

Browse Source 
Not all architectures have a time_t defined the same way.  To make
sure we get the same result, we need to cast &checkoffset to (intmax_t *)
and make sure that intmax_t is defined somehow.

To make really sure we don't pass a variable with the wrong size down
to opt_imax(), we use a temporary intmax_t.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-01-30 15:39:34 +01:00
parent 421e30ec67
commit 33254e1c6f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/apps.h
View File

@ -145,6 +145,8 @@ int opt_umax(const char *value, uintmax_t *result);
# else
# define opt_imax opt_long
# define opt_umax opt_ulong
# define intmax_t long
# define uintmax_t unsigned long
# endif
int app_RAND_load_file(const char *file, int dont_warn);

8
apps/x509.c
View File

@ -468,13 +468,17 @@ int x509_main(int argc, char **argv)
break;
case OPT_CHECKEND:
checkend = 1;
if (!opt_imax(opt_arg(), &checkoffset))
{
intmax_t temp = 0;
if (!opt_imax(opt_arg(), &temp))
goto opthelp;
if (checkoffset != (time_t)checkoffset) {
checkoffset = (time_t)temp;
if ((intmax_t)checkoffset != temp) {
BIO_printf(bio_err, "%s: checkend time out of range %s\n",
prog, opt_arg());
goto opthelp;
}
}
break;
case OPT_CHECKHOST:
checkhost = opt_arg();