diff options
| author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-12 21:13:34 -0500 |
|---|---|---|
| committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-12 21:37:39 -0500 |
| commit | 03f887ca1213744e2da3ec50f46d9fe3bc269510 (patch) | |
| tree | 3ec7c5239598d87c71d04d076604d0d81f263efe /apps/apps.h | |
| parent | ef30a6845a538067829deadca61b000cedf214fd (diff) | |
Maximize time_t when intmax_t is available
Well, I'm not actually changing time_t, just changing how time_t
valued opt values are converted from string to time_t.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/apps.h b/apps/apps.h index e259658918..3ab453bef8 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -116,6 +116,7 @@ # include <assert.h> # include <openssl/e_os2.h> +# include <openssl/ossl_typ.h> # include <openssl/bio.h> # include <openssl/x509.h> # include <openssl/lhash.h> @@ -185,7 +186,7 @@ void wait_for_async(SSL *s); { "purpose", OPT_V_PURPOSE, 's' }, \ { "verify_name", OPT_V_VERIFY_NAME, 's' }, \ { "verify_depth", OPT_V_VERIFY_DEPTH, 'p' }, \ - { "attime", OPT_V_ATTIME, 'p' }, \ + { "attime", OPT_V_ATTIME, 'M' }, \ { "verify_hostname", OPT_V_VERIFY_HOSTNAME, 's' }, \ { "verify_email", OPT_V_VERIFY_EMAIL, 's' }, \ { "verify_ip", OPT_V_VERIFY_IP, 's' }, \ @@ -384,6 +385,10 @@ int opt_format(const char *s, unsigned long flags, int *result); int opt_int(const char *arg, int *result); int opt_ulong(const char *arg, unsigned long *result); int opt_long(const char *arg, long *result); +#if defined(INTMAX_MAX) && defined(UINTMAX_MAX) +int opt_imax(const char *arg, intmax_t *result); +int opt_umax(const char *arg, uintmax_t *result); +#endif int opt_pair(const char *arg, const OPT_PAIR * pairs, int *result); int opt_cipher(const char *name, const EVP_CIPHER **cipherp); int opt_md(const char *name, const EVP_MD **mdp); |