X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=apps%2Fopenssl.c;h=37f71a94d6a2e7207e69ce4be836804871867fac;hb=3e9e810f2e047effb1056211794d2d12ec2b04e7;hp=9e8843c8c588d8c1c95614fd3055f78a9ddf332e;hpb=27dae1b04fb5d5af32b87c5e52091fe74632efa3;p=openssl.git diff --git a/apps/openssl.c b/apps/openssl.c index 9e8843c8c5..37f71a94d6 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -153,7 +153,6 @@ * required type of "FUNCTION*"). This removes the necessity for * macro-generated wrapper functions. */ -DECLARE_LHASH_OF(FUNCTION); static LHASH_OF(FUNCTION) *prog_init(void); static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[]); static void list_pkey(void); @@ -166,22 +165,30 @@ BIO *bio_in = NULL; BIO *bio_out = NULL; BIO *bio_err = NULL; -static void apps_startup() +static int apps_startup() { #ifdef SIGPIPE signal(SIGPIPE, SIG_IGN); #endif - CRYPTO_malloc_init(); ERR_load_crypto_strings(); ERR_load_SSL_strings(); - OpenSSL_add_all_algorithms(); - OpenSSL_add_ssl_algorithms(); + OPENSSL_load_builtin_modules(); - setup_ui_method(); - /*SSL_library_init();*/ + SSL_add_ssl_module(); #ifndef OPENSSL_NO_ENGINE ENGINE_load_builtin_engines(); #endif + if (!app_load_modules(NULL)) { + ERR_print_errors(bio_err); + BIO_printf(bio_err, "Error loading default configuration\n"); + return 0; + } + + OpenSSL_add_all_algorithms(); + OpenSSL_add_ssl_algorithms(); + setup_ui_method(); + /*SSL_library_init();*/ + return 1; } static void apps_shutdown() @@ -209,9 +216,8 @@ static char *make_config_name() size_t len; char *p; - if ((t = getenv("OPENSSL_CONF")) != NULL - || (t = getenv("SSLEAY_CONF")) != NULL) - return BUF_strdup(t); + if ((t = getenv("OPENSSL_CONF")) != NULL) + return OPENSSL_strdup(t); t = X509_get_default_cert_area(); len = strlen(t) + 1 + strlen(OPENSSL_CONF) + 1; @@ -303,15 +309,8 @@ int main(int argc, char *argv[]) #endif p = getenv("OPENSSL_DEBUG_MEMORY"); - if (p == NULL) - /* if not set, use compiled-in default */ - ; - else if (strcmp(p, "off") != 0) { - CRYPTO_malloc_debug_init(); - CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL); - } else { - CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0); - } + if (p != NULL && strcmp(p, "on") == 0) + CRYPTO_set_mem_debug(1); CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); CRYPTO_set_locking_callback(lock_dbg_cb); @@ -328,18 +327,9 @@ int main(int argc, char *argv[]) #endif } - apps_startup(); + if (!apps_startup()) + goto end; - /* - * If first argument is a colon, skip it. Because in "interactive" - * mode our prompt is a colon and we can cut/paste whole lines - * by doing this hack. - */ - if (argv[1] && strcmp(argv[1], ":") == 0) { - argv[1] = argv[0]; - argc--; - argv++; - } prog = prog_init(); pname = opt_progname(argv[0]); @@ -367,7 +357,7 @@ int main(int argc, char *argv[]) ret = 0; /* Read a line, continue reading if line ends with \ */ for (p = buf, n = sizeof buf, i = 0, first = 1; n > 0; first = 0) { - prompt = first ? "openssl : " : "> "; + prompt = first ? "OpenSSL> " : "> "; p[0] = '\0'; #ifndef READLINE fputs(prompt, stdout); @@ -438,9 +428,11 @@ int main(int argc, char *argv[]) BIO_free(bio_in); BIO_free_all(bio_out); apps_shutdown(); +#ifndef OPENSSL_NO_CRYPTO_MDEBUG CRYPTO_mem_leaks(bio_err); +#endif BIO_free(bio_err); - return (ret); + EXIT(ret); } OPTIONS exit_options[] = { @@ -504,11 +496,12 @@ int list_main(int argc, char **argv) { char *prog; HELPLIST_CHOICE o; + int done = 0; prog = opt_init(argc, argv, list_options); while ((o = opt_next()) != OPT_EOF) { switch (o) { - case OPT_EOF: + case OPT_EOF: /* Never hit, but suppresses warning */ case OPT_ERR: BIO_printf(bio_err, "%s: Use -help for summary.\n", prog); return 1; @@ -537,6 +530,12 @@ int list_main(int argc, char **argv) list_disabled(); break; } + done = 1; + } + + if (!done) { + BIO_printf(bio_err, "%s: Use -help for summary.\n", prog); + return 1; } return 0; @@ -701,15 +700,11 @@ static int function_cmp(const FUNCTION * a, const FUNCTION * b) return strncmp(a->name, b->name, 8); } -static IMPLEMENT_LHASH_COMP_FN(function, FUNCTION) - static unsigned long function_hash(const FUNCTION * a) { return lh_strhash(a->name); } -static IMPLEMENT_LHASH_HASH_FN(function, FUNCTION) - static int SortFnByName(const void *_f1, const void *_f2) { const FUNCTION *f1 = _f1; @@ -735,18 +730,36 @@ static void list_disabled(void) #ifdef OPENSSL_NO_CAST BIO_puts(bio_out, "CAST\n"); #endif +#ifdef OPENSSL_NO_CMAC + BIO_puts(bio_out, "CMAC\n"); +#endif #ifdef OPENSSL_NO_CMS BIO_puts(bio_out, "CMS\n"); #endif +#ifdef OPENSSL_NO_COMP + BIO_puts(bio_out, "COMP\n"); +#endif #ifdef OPENSSL_NO_DES BIO_puts(bio_out, "DES\n"); #endif +#ifdef OPENSSL_NO_DGRAM + BIO_puts(bio_out, "DGRAM\n"); +#endif #ifdef OPENSSL_NO_DH BIO_puts(bio_out, "DH\n"); #endif #ifdef OPENSSL_NO_DSA BIO_puts(bio_out, "DSA\n"); #endif +#if defined(OPENSSL_NO_DTLS) + BIO_puts(bio_out, "DTLS\n"); +#endif +#if defined(OPENSSL_NO_DTLS1) + BIO_puts(bio_out, "DTLS1\n"); +#endif +#if defined(OPENSSL_NO_DTLS1_2) + BIO_puts(bio_out, "DTLS1_2\n"); +#endif #ifdef OPENSSL_NO_EC BIO_puts(bio_out, "EC\n"); #endif @@ -756,9 +769,18 @@ static void list_disabled(void) #ifdef OPENSSL_NO_ENGINE BIO_puts(bio_out, "ENGINE\n"); #endif +#ifdef OPENSSL_NO_GOST + BIO_puts(bio_out, "GOST\n"); +#endif +#ifdef OPENSSL_NO_HMAC + BIO_puts(bio_out, "HMAC\n"); +#endif #ifdef OPENSSL_NO_IDEA BIO_puts(bio_out, "IDEA\n"); #endif +#ifdef OPENSSL_NO_JPAKE + BIO_puts(bio_out, "JPAKE\n"); +#endif #ifdef OPENSSL_NO_MD2 BIO_puts(bio_out, "MD2\n"); #endif @@ -771,9 +793,9 @@ static void list_disabled(void) #ifdef OPENSSL_NO_MDC2 BIO_puts(bio_out, "MDC2\n"); #endif -#ifdef OPENSSL_NO_MD - BIO_puts(bio_out, "MD\n"); -#endif_GHOST94 +#ifdef OPENSSL_NO_OCB + BIO_puts(bio_out, "OCB\n"); +#endif #ifdef OPENSSL_NO_OCSP BIO_puts(bio_out, "OCSP\n"); #endif @@ -795,15 +817,48 @@ static void list_disabled(void) #ifdef OPENSSL_NO_RSA BIO_puts(bio_out, "RSA\n"); #endif +#ifdef OPENSSL_NO_SCRYPT + BIO_puts(bio_out, "SCRYPT\n"); +#endif +#ifdef OPENSSL_NO_SCT + BIO_puts(bio_out, "SCT\n"); +#endif +#ifdef OPENSSL_NO_SCTP + BIO_puts(bio_out, "SCTP\n"); +#endif #ifdef OPENSSL_NO_SEED BIO_puts(bio_out, "SEED\n"); #endif +#ifdef OPENSSL_NO_SHA + BIO_puts(bio_out, "SHA\n"); +#endif #ifdef OPENSSL_NO_SOCK BIO_puts(bio_out, "SOCK\n"); #endif #ifdef OPENSSL_NO_SRP BIO_puts(bio_out, "SRP\n"); #endif +#ifdef OPENSSL_NO_SRTP + BIO_puts(bio_out, "SRTP\n"); +#endif +#ifdef OPENSSL_NO_SSL + BIO_puts(bio_out, "SSL\n"); +#endif +#ifdef OPENSSL_NO_SSL3 + BIO_puts(bio_out, "SSL3\n"); +#endif +#if defined(OPENSSL_NO_TLS) + BIO_puts(bio_out, "TLS\n"); +#endif +#ifdef OPENSSL_NO_TLS1 + BIO_puts(bio_out, "TLS1\n"); +#endif +#ifdef OPENSSL_NO_TLS1_1 + BIO_puts(bio_out, "TLS1_1\n"); +#endif +#ifdef OPENSSL_NO_TLS1_2 + BIO_puts(bio_out, "TLS1_2\n"); +#endif #ifdef OPENSSL_NO_WHIRLPOOL BIO_puts(bio_out, "WHIRLPOOL\n"); #endif @@ -822,7 +877,7 @@ static LHASH_OF(FUNCTION) *prog_init(void) for (i = 0, f = functions; f->name != NULL; ++f, ++i) ; qsort(functions, i, sizeof(*functions), SortFnByName); - if ((ret = lh_FUNCTION_new()) == NULL) + if ((ret = lh_FUNCTION_new(function_hash, function_cmp)) == NULL) return (NULL); for (f = functions; f->name != NULL; f++)