mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clarify the error messages in 08f6ae5b28

Browse Source 
Ensure it is clear to the user why there has been an error.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2016-08-24 13:36:07 +01:00
parent 0a307450bf
commit efba7787cd
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/cms.c
View File

@ -413,8 +413,8 @@ int cms_main(int argc, char **argv)
break;
case OPT_SECRETKEY:
if (secret_key != NULL) {
/* Cannot be supplied twice */
BIO_printf(bio_err, "Invalid key %s\n", opt_arg());
BIO_printf(bio_err, "Invalid key (supplied twice) %s\n",
opt_arg());
goto opthelp;
}
secret_key = OPENSSL_hexstr2buf(opt_arg(), &ltmp);
@ -426,8 +426,8 @@ int cms_main(int argc, char **argv)
break;
case OPT_SECRETKEYID:
if (secret_keyid != NULL) {
/* Cannot be supplied twice */
BIO_printf(bio_err, "Invalid id %s\n", opt_arg());
BIO_printf(bio_err, "Invalid id (supplied twice) %s\n",
opt_arg());
goto opthelp;
}
secret_keyid = OPENSSL_hexstr2buf(opt_arg(), &ltmp);
@ -442,8 +442,8 @@ int cms_main(int argc, char **argv)
break;
case OPT_ECONTENT_TYPE:
if (econtent_type != NULL) {
/* Cannot be supplied twice */
BIO_printf(bio_err, "Invalid OID %s\n", opt_arg());
BIO_printf(bio_err, "Invalid OID (supplied twice) %s\n",
opt_arg());
goto opthelp;
}
econtent_type = OBJ_txt2obj(opt_arg(), 0);

2
apps/req.c
View File

@ -296,7 +296,7 @@ int req_main(int argc, char **argv)
break;
case OPT_SET_SERIAL:
if (serial != NULL) {
/* Cannot be supplied twice */
BIO_printf(bio_err, "Serial number supplied twice\n");
goto opthelp;
}
serial = s2i_ASN1_INTEGER(NULL, opt_arg());

2
apps/x509.c
View File

@ -262,7 +262,7 @@ int x509_main(int argc, char **argv)
break;
case OPT_SET_SERIAL:
if (sno != NULL) {
/* Cannot be supplied twice */
BIO_printf(bio_err, "Serial number supplied twice\n");
goto opthelp;
}
if ((sno = s2i_ASN1_INTEGER(NULL, opt_arg())) == NULL)