mirror of
https://github.com/openssl/openssl.git
synced 2024-12-03 05:41:46 +08:00
021410ea3f
Make sure all commands check to see if there are any "extra" arguments after the options, and print an error if so. Made all error messages consistent (which is to say, minimal). Fixes: #13527 Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13563)
105 lines
3.0 KiB
C
105 lines
3.0 KiB
C
/*
|
|
* Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/crypto.h>
|
|
#include "apps.h"
|
|
#include "progs.h"
|
|
|
|
typedef enum OPTION_choice {
|
|
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
|
|
OPT_CONFIGDIR, OPT_ENGINESDIR, OPT_MODULESDIR, OPT_DSOEXT, OPT_DIRNAMESEP,
|
|
OPT_LISTSEP, OPT_SEEDS, OPT_CPUSETTINGS
|
|
} OPTION_CHOICE;
|
|
|
|
const OPTIONS info_options[] = {
|
|
|
|
OPT_SECTION("General"),
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
|
|
OPT_SECTION("Output"),
|
|
{"configdir", OPT_CONFIGDIR, '-', "Default configuration file directory"},
|
|
{"enginesdir", OPT_ENGINESDIR, '-', "Default engine module directory"},
|
|
{"modulesdir", OPT_MODULESDIR, '-',
|
|
"Default module directory (other than engine modules)"},
|
|
{"dsoext", OPT_DSOEXT, '-', "Configured extension for modules"},
|
|
{"dirnamesep", OPT_DIRNAMESEP, '-', "Directory-filename separator"},
|
|
{"listsep", OPT_LISTSEP, '-', "List separator character"},
|
|
{"seeds", OPT_SEEDS, '-', "Seed sources"},
|
|
{"cpusettings", OPT_CPUSETTINGS, '-', "CPU settings info"},
|
|
{NULL}
|
|
};
|
|
|
|
int info_main(int argc, char **argv)
|
|
{
|
|
int ret = 1, dirty = 0, type = 0;
|
|
char *prog;
|
|
OPTION_CHOICE o;
|
|
|
|
prog = opt_init(argc, argv, info_options);
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
switch (o) {
|
|
default:
|
|
opthelp:
|
|
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
|
|
goto end;
|
|
case OPT_HELP:
|
|
opt_help(info_options);
|
|
ret = 0;
|
|
goto end;
|
|
case OPT_CONFIGDIR:
|
|
type = OPENSSL_INFO_CONFIG_DIR;
|
|
dirty++;
|
|
break;
|
|
case OPT_ENGINESDIR:
|
|
type = OPENSSL_INFO_ENGINES_DIR;
|
|
dirty++;
|
|
break;
|
|
case OPT_MODULESDIR:
|
|
type = OPENSSL_INFO_MODULES_DIR;
|
|
dirty++;
|
|
break;
|
|
case OPT_DSOEXT:
|
|
type = OPENSSL_INFO_DSO_EXTENSION;
|
|
dirty++;
|
|
break;
|
|
case OPT_DIRNAMESEP:
|
|
type = OPENSSL_INFO_DIR_FILENAME_SEPARATOR;
|
|
dirty++;
|
|
break;
|
|
case OPT_LISTSEP:
|
|
type = OPENSSL_INFO_LIST_SEPARATOR;
|
|
dirty++;
|
|
break;
|
|
case OPT_SEEDS:
|
|
type = OPENSSL_INFO_SEED_SOURCE;
|
|
dirty++;
|
|
break;
|
|
case OPT_CPUSETTINGS:
|
|
type = OPENSSL_INFO_CPU_SETTINGS;
|
|
dirty++;
|
|
break;
|
|
}
|
|
}
|
|
if (opt_num_rest() != 0)
|
|
goto opthelp;
|
|
if (dirty > 1) {
|
|
BIO_printf(bio_err, "%s: Only one item allowed\n", prog);
|
|
goto opthelp;
|
|
}
|
|
if (dirty == 0) {
|
|
BIO_printf(bio_err, "%s: No items chosen\n", prog);
|
|
goto opthelp;
|
|
}
|
|
|
|
BIO_printf(bio_out, "%s\n", OPENSSL_info(type));
|
|
ret = 0;
|
|
end:
|
|
return ret;
|
|
}
|