[openssl] master update
dev at ddvo.net
dev at ddvo.net
Sat Apr 24 16:56:33 UTC 2021
The branch master has been updated
via d830526c711074fdcd82c70c24c31444366a1ed8 (commit)
via 1ae33400bf6559fa9ca9aa2232120dbc7ddc19b8 (commit)
from a70936a8453a307992820f2a9d3e252f6c4f9ad6 (commit)
- Log -----------------------------------------------------------------
commit d830526c711074fdcd82c70c24c31444366a1ed8
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date: Wed Apr 21 13:08:21 2021 +0200
APPS: Improve diagnostics for string options and options expecting int >= 0
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14970)
commit 1ae33400bf6559fa9ca9aa2232120dbc7ddc19b8
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date: Wed Apr 21 13:51:03 2021 +0200
APPS: Prevent ASAN hickup on idempotent strncpy() in opt_progname()
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14970)
-----------------------------------------------------------------------
Summary of changes:
apps/cmp.c | 216 ++++++++++++++++++++++----------------------
apps/enc.c | 3 +-
apps/genrsa.c | 3 +-
apps/include/opt.h | 2 +
apps/lib/opt.c | 38 ++++++--
apps/ocsp.c | 4 +-
apps/pkcs12.c | 4 +-
apps/pkcs8.c | 3 +-
apps/s_time.c | 6 +-
apps/speed.c | 6 +-
doc/man1/openssl-cmp.pod.in | 2 +-
11 files changed, 155 insertions(+), 132 deletions(-)
diff --git a/apps/cmp.c b/apps/cmp.c
index 1fbf10c4a4..494b27d294 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -255,7 +255,7 @@ const OPTIONS cmp_options[] = {
"Configuration file to use. \"\" = none. Default from env variable OPENSSL_CONF"},
{"section", OPT_SECTION, 's',
"Section(s) in config file to get options from. \"\" = 'default'. Default 'cmp'"},
- {"verbosity", OPT_VERBOSITY, 'n',
+ {"verbosity", OPT_VERBOSITY, 'N',
"Log level; 3=ERR, 4=WARN, 6=INFO, 7=DEBUG, 8=TRACE. Default 6 = INFO"},
OPT_SECTION("Generic message"),
@@ -281,7 +281,7 @@ const OPTIONS cmp_options[] = {
"DN of the issuer to place in the requested certificate template"},
{OPT_MORE_STR, 0, 0,
"also used as recipient if neither -recipient nor -srvcert are given"},
- {"days", OPT_DAYS, 'n',
+ {"days", OPT_DAYS, 'N',
"Requested validity time of the new certificate in number of days"},
{"reqexts", OPT_REQEXTS, 's',
"Name of config file section defining certificate request extensions."},
@@ -344,9 +344,9 @@ const OPTIONS cmp_options[] = {
"Default from environment variable 'no_proxy', else 'NO_PROXY', else none"},
{"recipient", OPT_RECIPIENT, 's',
"DN of CA. Default: subject of -srvcert, -issuer, issuer of -oldcert or -cert"},
- {"msg_timeout", OPT_MSG_TIMEOUT, 'n',
+ {"msg_timeout", OPT_MSG_TIMEOUT, 'N',
"Timeout per CMP message round trip (or 0 for none). Default 120 seconds"},
- {"total_timeout", OPT_TOTAL_TIMEOUT, 'n',
+ {"total_timeout", OPT_TOTAL_TIMEOUT, 'N',
"Overall time an enrollment incl. polling may take. Default 0 = infinite"},
OPT_SECTION("Server authentication"),
@@ -435,8 +435,8 @@ const OPTIONS cmp_options[] = {
OPT_SECTION("Client-side debugging"),
{"batch", OPT_BATCH, '-',
"Do not interactively prompt for input when a password is required etc."},
- {"repeat", OPT_REPEAT, 'n',
- "Invoke the transaction the given number of times. Default 1"},
+ {"repeat", OPT_REPEAT, 'p',
+ "Invoke the transaction the given positive number of times. Default 1"},
{"reqin", OPT_REQIN, 's', "Take sequence of CMP requests from file(s)"},
{"reqin_new_tid", OPT_REQIN_NEW_TID, '-',
"Use fresh transactionID for CMP requests read from -reqin"},
@@ -449,7 +449,7 @@ const OPTIONS cmp_options[] = {
OPT_SECTION("Mock server"),
{"port", OPT_PORT, 's', "Act as HTTP mock server listening on given port"},
- {"max_msgs", OPT_MAX_MSGS, 'n',
+ {"max_msgs", OPT_MAX_MSGS, 'N',
"max number of messages handled by HTTP mock server. Default: 0 = unlimited"},
{"srv_ref", OPT_SRV_REF, 's',
@@ -472,18 +472,18 @@ const OPTIONS cmp_options[] = {
"Extra certificates to be included in mock certification responses"},
{"rsp_capubs", OPT_RSP_CAPUBS, 's',
"CA certificates to be included in mock ip response"},
- {"poll_count", OPT_POLL_COUNT, 'n',
+ {"poll_count", OPT_POLL_COUNT, 'N',
"Number of times the client must poll before receiving a certificate"},
- {"check_after", OPT_CHECK_AFTER, 'n',
+ {"check_after", OPT_CHECK_AFTER, 'N',
"The check_after value (time to wait) to include in poll response"},
{"grant_implicitconf", OPT_GRANT_IMPLICITCONF, '-',
"Grant implicit confirmation of newly enrolled certificate"},
- {"pkistatus", OPT_PKISTATUS, 'n',
+ {"pkistatus", OPT_PKISTATUS, 'N',
"PKIStatus to be included in server response. Possible values: 0..6"},
- {"failure", OPT_FAILURE, 'n',
+ {"failure", OPT_FAILURE, 'N',
"A single failure info bit number to include in server response, 0..26"},
- {"failurebits", OPT_FAILUREBITS, 'n',
+ {"failurebits", OPT_FAILUREBITS, 'N',
"Number representing failure bits to include in server response, 0..2^27 - 1"},
{"statusstring", OPT_STATUSSTRING, 's',
"Status string to be included in server response"},
@@ -2092,12 +2092,24 @@ static int read_config(void)
i--;
switch (opt->valtype) {
case '-':
+ case 'p':
case 'n':
+ case 'N':
case 'l':
if (!conf_get_number_e(conf, opt_section, opt->name, &num)) {
ERR_clear_error();
continue; /* option not provided */
}
+ if (opt->valtype == 'p' && num <= 0) {
+ opt_printf_stderr("Non-positive number \"%ld\" for config option -%s\n",
+ num, opt->name);
+ return -1;
+ }
+ if (opt->valtype == 'N' && num <= 0) {
+ opt_printf_stderr("Negative number \"%ld\" for config option -%s\n",
+ num, opt->name);
+ return -1;
+ }
break;
case 's':
case '>':
@@ -2144,7 +2156,9 @@ static int read_config(void)
} else {
switch (opt->valtype) {
case '-':
+ case 'p':
case 'n':
+ case 'N':
if (num < INT_MIN || INT_MAX < num) {
BIO_printf(bio_err,
"integer value out of range for option '%s'\n",
@@ -2168,30 +2182,20 @@ static int read_config(void)
return 1;
}
-static char *opt_str(char *opt)
+static char *opt_str(void)
{
char *arg = opt_arg();
if (arg[0] == '\0') {
- CMP_warn1("argument of -%s option is empty string, resetting option",
- opt);
+ CMP_warn1("%s option argument is empty string, resetting option",
+ opt_name());
arg = NULL;
} else if (arg[0] == '-') {
- CMP_warn1("argument of -%s option starts with hyphen", opt);
+ CMP_warn1("%s option argument starts with hyphen", opt_name());
}
return arg;
}
-static int opt_nat(void)
-{
- int result = -1;
-
- if (opt_int(opt_arg(), &result) && result < 0)
- BIO_printf(bio_err, "error: argument '%s' must not be negative\n",
- opt_arg());
- return result;
-}
-
/* returns 1 on success, 0 on error, -1 on -help (i.e., stop with success) */
static int get_opts(int argc, char **argv)
{
@@ -2214,91 +2218,89 @@ static int get_opts(int argc, char **argv)
case OPT_VERBOSITY: /* has already been handled */
break;
case OPT_SERVER:
- opt_server = opt_str("server");
+ opt_server = opt_str();
break;
case OPT_PROXY:
- opt_proxy = opt_str("proxy");
+ opt_proxy = opt_str();
break;
case OPT_NO_PROXY:
- opt_no_proxy = opt_str("no_proxy");
+ opt_no_proxy = opt_str();
break;
case OPT_PATH:
- opt_path = opt_str("path");
+ opt_path = opt_str();
break;
case OPT_RECIPIENT:
- opt_recipient = opt_str("recipient");
+ opt_recipient = opt_str();
break;
case OPT_MSG_TIMEOUT:
- if ((opt_msg_timeout = opt_nat()) < 0)
- goto opthelp;
+ opt_msg_timeout = opt_int_arg();
break;
case OPT_TOTAL_TIMEOUT:
- if ((opt_total_timeout = opt_nat()) < 0)
- goto opthelp;
+ opt_total_timeout = opt_int_arg();
break;
case OPT_TLS_USED:
opt_tls_used = 1;
break;
case OPT_TLS_CERT:
- opt_tls_cert = opt_str("tls_cert");
+ opt_tls_cert = opt_str();
break;
case OPT_TLS_KEY:
- opt_tls_key = opt_str("tls_key");
+ opt_tls_key = opt_str();
break;
case OPT_TLS_KEYPASS:
- opt_tls_keypass = opt_str("tls_keypass");
+ opt_tls_keypass = opt_str();
break;
case OPT_TLS_EXTRA:
- opt_tls_extra = opt_str("tls_extra");
+ opt_tls_extra = opt_str();
break;
case OPT_TLS_TRUSTED:
- opt_tls_trusted = opt_str("tls_trusted");
+ opt_tls_trusted = opt_str();
break;
case OPT_TLS_HOST:
- opt_tls_host = opt_str("tls_host");
+ opt_tls_host = opt_str();
break;
case OPT_REF:
- opt_ref = opt_str("ref");
+ opt_ref = opt_str();
break;
case OPT_SECRET:
- opt_secret = opt_str("secret");
+ opt_secret = opt_str();
break;
case OPT_CERT:
- opt_cert = opt_str("cert");
+ opt_cert = opt_str();
break;
case OPT_OWN_TRUSTED:
- opt_own_trusted = opt_str("own_trusted");
+ opt_own_trusted = opt_str();
break;
case OPT_KEY:
- opt_key = opt_str("key");
+ opt_key = opt_str();
break;
case OPT_KEYPASS:
- opt_keypass = opt_str("keypass");
+ opt_keypass = opt_str();
break;
case OPT_DIGEST:
- opt_digest = opt_str("digest");
+ opt_digest = opt_str();
break;
case OPT_MAC:
- opt_mac = opt_str("mac");
+ opt_mac = opt_str();
break;
case OPT_EXTRACERTS:
- opt_extracerts = opt_str("extracerts");
+ opt_extracerts = opt_str();
break;
case OPT_UNPROTECTED_REQUESTS:
opt_unprotected_requests = 1;
break;
case OPT_TRUSTED:
- opt_trusted = opt_str("trusted");
+ opt_trusted = opt_str();
break;
case OPT_UNTRUSTED:
- opt_untrusted = opt_str("untrusted");
+ opt_untrusted = opt_str();
break;
case OPT_SRVCERT:
- opt_srvcert = opt_str("srvcert");
+ opt_srvcert = opt_str();
break;
case OPT_EXPECT_SENDER:
- opt_expect_sender = opt_str("expect_sender");
+ opt_expect_sender = opt_str();
break;
case OPT_IGNORE_KEYUSAGE:
opt_ignore_keyusage = 1;
@@ -2307,10 +2309,10 @@ static int get_opts(int argc, char **argv)
opt_unprotected_errors = 1;
break;
case OPT_EXTRACERTSOUT:
- opt_extracertsout = opt_str("extracertsout");
+ opt_extracertsout = opt_str();
break;
case OPT_CACERTSOUT:
- opt_cacertsout = opt_str("cacertsout");
+ opt_cacertsout = opt_str();
break;
case OPT_V_CASES:
@@ -2318,52 +2320,51 @@ static int get_opts(int argc, char **argv)
goto opthelp;
break;
case OPT_CMD:
- opt_cmd_s = opt_str("cmd");
+ opt_cmd_s = opt_str();
break;
case OPT_INFOTYPE:
- opt_infotype_s = opt_str("infotype");
+ opt_infotype_s = opt_str();
break;
case OPT_GENINFO:
- opt_geninfo = opt_str("geninfo");
+ opt_geninfo = opt_str();
break;
case OPT_NEWKEY:
- opt_newkey = opt_str("newkey");
+ opt_newkey = opt_str();
break;
case OPT_NEWKEYPASS:
- opt_newkeypass = opt_str("newkeypass");
+ opt_newkeypass = opt_str();
break;
case OPT_SUBJECT:
- opt_subject = opt_str("subject");
+ opt_subject = opt_str();
break;
case OPT_ISSUER:
- opt_issuer = opt_str("issuer");
+ opt_issuer = opt_str();
break;
case OPT_DAYS:
- if ((opt_days = opt_nat()) < 0)
- goto opthelp;
+ opt_days = opt_int_arg();
break;
case OPT_REQEXTS:
- opt_reqexts = opt_str("reqexts");
+ opt_reqexts = opt_str();
break;
case OPT_SANS:
- opt_sans = opt_str("sans");
+ opt_sans = opt_str();
break;
case OPT_SAN_NODEFAULT:
opt_san_nodefault = 1;
break;
case OPT_POLICIES:
- opt_policies = opt_str("policies");
+ opt_policies = opt_str();
break;
case OPT_POLICY_OIDS:
- opt_policy_oids = opt_str("policy_oids");
+ opt_policy_oids = opt_str();
break;
case OPT_POLICY_OIDS_CRITICAL:
opt_policy_oids_critical = 1;
break;
case OPT_POPO:
- if (!opt_int(opt_arg(), &opt_popo)
- || opt_popo < OSSL_CRMF_POPO_NONE
+ opt_popo = opt_int_arg();
+ if (opt_popo < OSSL_CRMF_POPO_NONE
|| opt_popo > OSSL_CRMF_POPO_KEYENC) {
CMP_err("invalid popo spec. Valid values are -1 .. 2");
goto opthelp;
@@ -2373,7 +2374,7 @@ static int get_opts(int argc, char **argv)
opt_csr = opt_arg();
break;
case OPT_OUT_TRUSTED:
- opt_out_trusted = opt_str("out_trusted");
+ opt_out_trusted = opt_str();
break;
case OPT_IMPLICIT_CONFIRM:
opt_implicit_confirm = 1;
@@ -2382,17 +2383,17 @@ static int get_opts(int argc, char **argv)
opt_disable_confirm = 1;
break;
case OPT_CERTOUT:
- opt_certout = opt_str("certout");
+ opt_certout = opt_str();
break;
case OPT_CHAINOUT:
- opt_chainout = opt_str("chainout");
+ opt_chainout = opt_str();
break;
case OPT_OLDCERT:
- opt_oldcert = opt_str("oldcert");
+ opt_oldcert = opt_str();
break;
case OPT_REVREASON:
- if (!opt_int(opt_arg(), &opt_revreason)
- || opt_revreason < CRL_REASON_NONE
+ opt_revreason = opt_int_arg();
+ if (opt_revreason < CRL_REASON_NONE
|| opt_revreason > CRL_REASON_AA_COMPROMISE
|| opt_revreason == 7) {
CMP_err("invalid revreason. Valid values are -1 .. 6, 8 .. 10");
@@ -2400,17 +2401,17 @@ static int get_opts(int argc, char **argv)
}
break;
case OPT_CERTFORM:
- opt_certform_s = opt_str("certform");
+ opt_certform_s = opt_str();
break;
case OPT_KEYFORM:
- opt_keyform_s = opt_str("keyform");
+ opt_keyform_s = opt_str();
break;
case OPT_OTHERPASS:
- opt_otherpass = opt_str("otherpass");
+ opt_otherpass = opt_str();
break;
#ifndef OPENSSL_NO_ENGINE
case OPT_ENGINE:
- opt_engine = opt_str("engine");
+ opt_engine = opt_str();
break;
#endif
case OPT_PROV_CASES:
@@ -2426,83 +2427,82 @@ static int get_opts(int argc, char **argv)
opt_batch = 1;
break;
case OPT_REPEAT:
- opt_repeat = opt_nat();
+ opt_repeat = opt_int_arg();
break;
case OPT_REQIN:
- opt_reqin = opt_str("reqin");
+ opt_reqin = opt_str();
break;
case OPT_REQIN_NEW_TID:
opt_reqin_new_tid = 1;
break;
case OPT_REQOUT:
- opt_reqout = opt_str("reqout");
+ opt_reqout = opt_str();
break;
case OPT_RSPIN:
- opt_rspin = opt_str("rspin");
+ opt_rspin = opt_str();
break;
case OPT_RSPOUT:
- opt_rspout = opt_str("rspout");
+ opt_rspout = opt_str();
break;
case OPT_USE_MOCK_SRV:
opt_use_mock_srv = 1;
break;
case OPT_PORT:
- opt_port = opt_str("port");
+ opt_port = opt_str();
break;
case OPT_MAX_MSGS:
- if ((opt_max_msgs = opt_nat()) < 0)
- goto opthelp;
+ opt_max_msgs = opt_int_arg();
break;
case OPT_SRV_REF:
- opt_srv_ref = opt_str("srv_ref");
+ opt_srv_ref = opt_str();
break;
case OPT_SRV_SECRET:
- opt_srv_secret = opt_str("srv_secret");
+ opt_srv_secret = opt_str();
break;
case OPT_SRV_CERT:
- opt_srv_cert = opt_str("srv_cert");
+ opt_srv_cert = opt_str();
break;
case OPT_SRV_KEY:
- opt_srv_key = opt_str("srv_key");
+ opt_srv_key = opt_str();
break;
case OPT_SRV_KEYPASS:
- opt_srv_keypass = opt_str("srv_keypass");
+ opt_srv_keypass = opt_str();
break;
case OPT_SRV_TRUSTED:
- opt_srv_trusted = opt_str("srv_trusted");
+ opt_srv_trusted = opt_str();
break;
case OPT_SRV_UNTRUSTED:
- opt_srv_untrusted = opt_str("srv_untrusted");
+ opt_srv_untrusted = opt_str();
break;
case OPT_RSP_CERT:
- opt_rsp_cert = opt_str("rsp_cert");
+ opt_rsp_cert = opt_str();
break;
case OPT_RSP_EXTRACERTS:
- opt_rsp_extracerts = opt_str("rsp_extracerts");
+ opt_rsp_extracerts = opt_str();
break;
case OPT_RSP_CAPUBS:
- opt_rsp_capubs = opt_str("rsp_capubs");
+ opt_rsp_capubs = opt_str();
break;
case OPT_POLL_COUNT:
- opt_poll_count = opt_nat();
+ opt_poll_count = opt_int_arg();
break;
case OPT_CHECK_AFTER:
- opt_check_after = opt_nat();
+ opt_check_after = opt_int_arg();
break;
case OPT_GRANT_IMPLICITCONF:
opt_grant_implicitconf = 1;
break;
case OPT_PKISTATUS:
- opt_pkistatus = opt_nat();
+ opt_pkistatus = opt_int_arg();
break;
case OPT_FAILURE:
- opt_failure = opt_nat();
+ opt_failure = opt_int_arg();
break;
case OPT_FAILUREBITS:
- opt_failurebits = opt_nat();
+ opt_failurebits = opt_int_arg();
break;
case OPT_STATUSSTRING:
- opt_statusstring = opt_str("statusstring");
+ opt_statusstring = opt_str();
break;
case OPT_SEND_ERROR:
opt_send_error = 1;
@@ -2599,8 +2599,12 @@ int cmp_main(int argc, char **argv)
}
}
}
- if (!read_config())
+ ret = read_config();
+ if (ret <= 0) {
+ if (ret == -1)
+ BIO_printf(bio_err, "Use -help for summary.\n");
goto err;
+ }
}
}
(void)BIO_flush(bio_err); /* prevent interference with opt_help() */
diff --git a/apps/enc.c b/apps/enc.c
index 242d3ef0aa..217526f450 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -266,8 +266,7 @@ int enc_main(int argc, char **argv)
ciphername = opt_unknown();
break;
case OPT_ITER:
- if (!opt_int(opt_arg(), &iter))
- goto opthelp;
+ iter = opt_int_arg();
pbkdf2 = 1;
break;
case OPT_PBKDF2:
diff --git a/apps/genrsa.c b/apps/genrsa.c
index ee68d67043..e5118d4902 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -134,8 +134,7 @@ opthelp:
ciphername = opt_unknown();
break;
case OPT_PRIMES:
- if (!opt_int(opt_arg(), &primes))
- goto end;
+ primes = opt_int_arg();
break;
case OPT_VERBOSE:
verbose = 1;
diff --git a/apps/include/opt.h b/apps/include/opt.h
index 79018c8cb8..c8024975b2 100644
--- a/apps/include/opt.h
+++ b/apps/include/opt.h
@@ -351,6 +351,7 @@ void opt_begin(void);
int opt_format(const char *s, unsigned long flags, int *result);
const char *format2str(int format);
int opt_int(const char *arg, int *result);
+int opt_int_arg(void);
int opt_ulong(const char *arg, unsigned long *result);
int opt_long(const char *arg, long *result);
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
@@ -368,6 +369,7 @@ int opt_pair(const char *arg, const OPT_PAIR * pairs, int *result);
int opt_string(const char *name, const char **options);
int opt_cipher(const char *name, EVP_CIPHER **cipherp);
int opt_md(const char *name, EVP_MD **mdp);
+char *opt_name(void);
char *opt_arg(void);
char *opt_flag(void);
char *opt_unknown(void);
diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index d22a884e67..0c7405a921 100644
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -35,6 +35,7 @@ const char OPT_PARAM_STR[] = "-P";
static char **argv;
static int argc;
static int opt_index;
+static char *param_name;
static char *arg;
static char *flag;
static char *dunno;
@@ -105,7 +106,8 @@ char *opt_progname(const char *argv0)
/* Find last special character sys:[foo.bar]openssl */
p = opt_path_end(argv0);
q = strrchr(p, '.');
- strncpy(prog, p, sizeof(prog) - 1);
+ if (prog != p)
+ strncpy(prog, p, sizeof(prog) - 1);
prog[sizeof(prog) - 1] = '\0';
if (q != NULL && q - p < sizeof(prog))
prog[q - p] = '\0';
@@ -132,7 +134,8 @@ char *opt_progname(const char *argv0)
const char *p;
p = opt_path_end(argv0);
- strncpy(prog, p, sizeof(prog) - 1);
+ if (prog != p)
+ strncpy(prog, p, sizeof(prog) - 1);
prog[sizeof(prog) - 1] = '\0';
return prog;
}
@@ -185,7 +188,7 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
switch (i) {
case 0: case '-': case '/': case '<': case '>': case 'E': case 'F':
case 'M': case 'U': case 'f': case 'l': case 'n': case 'p': case 's':
- case 'u': case 'c': case ':':
+ case 'u': case 'c': case ':': case 'N':
break;
default:
OPENSSL_assert(0);
@@ -430,6 +433,15 @@ int opt_int(const char *value, int *result)
return 1;
}
+/* Parse and return a natural number, assuming range has been checked before. */
+int opt_int_arg(void)
+{
+ int result = -1;
+
+ (void)opt_int(arg, &result);
+ return result;
+}
+
static void opt_number_error(const char *v)
{
size_t i = 0;
@@ -733,7 +745,7 @@ int opt_next(void)
/* Look at current arg; at end of the list? */
arg = NULL;
- p = argv[opt_index];
+ p = param_name = argv[opt_index];
if (p == NULL)
return 0;
@@ -800,10 +812,16 @@ int opt_next(void)
break;
case 'p':
case 'n':
+ case 'N':
if (!opt_int(arg, &ival))
return -1;
if (o->valtype == 'p' && ival <= 0) {
- opt_printf_stderr("%s: Non-positive number \"%s\" for -%s\n",
+ opt_printf_stderr("%s: Non-positive number \"%s\" for option -%s\n",
+ prog, arg, o->name);
+ return -1;
+ }
+ if (o->valtype == 'N' && ival < 0) {
+ opt_printf_stderr("%s: Negative number \"%s\" for option -%s\n",
prog, arg, o->name);
return -1;
}
@@ -834,7 +852,7 @@ int opt_next(void)
o->valtype == 'F' ? OPT_FMT_PEMDER
: OPT_FMT_ANY, &ival))
break;
- opt_printf_stderr("%s: Invalid format \"%s\" for -%s\n",
+ opt_printf_stderr("%s: Invalid format \"%s\" for option -%s\n",
prog, arg, o->name);
return -1;
}
@@ -850,6 +868,12 @@ int opt_next(void)
return -1;
}
+/* Return the name of the most recent flag parameter. */
+char *opt_name(void)
+{
+ return param_name;
+}
+
/* Return the most recent flag parameter. */
char *opt_arg(void)
{
@@ -918,6 +942,8 @@ static const char *valtype2param(const OPTIONS *o)
return "format";
case 'M':
return "intmax";
+ case 'N':
+ return "nonneg";
case 'U':
return "uintmax";
}
diff --git a/apps/ocsp.c b/apps/ocsp.c
index fbc9cf46f4..35a328bc69 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -441,12 +441,12 @@ int ocsp_main(int argc, char **argv)
rca_filename = opt_arg();
break;
case OPT_NMIN:
- opt_int(opt_arg(), &nmin);
+ nmin = opt_int_arg();
if (ndays == -1)
ndays = 0;
break;
case OPT_REQUEST:
- opt_int(opt_arg(), &accept_count);
+ accept_count = opt_int_arg();
break;
case OPT_NDAYS:
ndays = atoi(opt_arg());
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index e8adeccb5c..306bcda7b4 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -235,9 +235,7 @@ int pkcs12_main(int argc, char **argv)
enc_flag = opt_unknown();
break;
case OPT_ITER:
- if (!opt_int(opt_arg(), &iter))
- goto opthelp;
- maciter = iter;
+ maciter = iter = opt_int_arg();
break;
case OPT_NOITER:
iter = 1;
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 653cb45faa..1c4dd1220b 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -157,8 +157,7 @@ int pkcs8_main(int argc, char **argv)
cipher = (EVP_CIPHER *)EVP_aes_256_cbc();
break;
case OPT_ITER:
- if (!opt_int(opt_arg(), &iter))
- goto opthelp;
+ iter = opt_int_arg();
break;
case OPT_PASSIN:
passinarg = opt_arg();
diff --git a/apps/s_time.c b/apps/s_time.c
index 6988bcec55..bda61176e3 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -154,8 +154,7 @@ int s_time_main(int argc, char **argv)
perform = 1;
break;
case OPT_VERIFY:
- if (!opt_int(opt_arg(), &verify_args.depth))
- goto opthelp;
+ verify_args.depth = opt_int_arg();
BIO_printf(bio_err, "%s: verify depth is %d\n",
prog, verify_args.depth);
break;
@@ -197,8 +196,7 @@ int s_time_main(int argc, char **argv)
st_bugs = 1;
break;
case OPT_TIME:
- if (!opt_int(opt_arg(), &maxtime))
- goto opthelp;
+ maxtime = opt_int_arg();
break;
case OPT_WWW:
www_path = opt_arg();
diff --git a/apps/speed.c b/apps/speed.c
index d867e87e45..939baf934d 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1596,8 +1596,7 @@ int speed_main(int argc, char **argv)
#endif
break;
case OPT_MISALIGN:
- if (!opt_int(opt_arg(), &misalign))
- goto end;
+ misalign = opt_int_arg();
if (misalign > MISALIGN) {
BIO_printf(bio_err,
"%s: Maximum offset is %d\n", prog, MISALIGN);
@@ -1625,8 +1624,7 @@ int speed_main(int argc, char **argv)
goto end;
break;
case OPT_PRIMES:
- if (!opt_int(opt_arg(), &primes))
- goto end;
+ primes = opt_int_arg();
break;
case OPT_SECONDS:
seconds.sym = seconds.rsa = seconds.dsa = seconds.ecdsa
diff --git a/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in
index be16c2e242..8700d6bdcf 100644
--- a/doc/man1/openssl-cmp.pod.in
+++ b/doc/man1/openssl-cmp.pod.in
@@ -843,7 +843,7 @@ This can be useful for batch processing and testing.
=item B<-repeat> I<number>
-Invoke the command the given number of times with the same parameters.
+Invoke the command the given positive number of times with the same parameters.
Default is one invocation.
=item B<-reqin> I<filenames>
More information about the openssl-commits
mailing list