#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
-/* needed for the _O_BINARY defs in the MS world */
-#define USE_SOCKETS
-#include "s_apps.h"
#include <openssl/err.h>
#ifdef OPENSSL_FIPS
# include <openssl/fips.h>
#endif
+#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
+#include "s_apps.h"
+/* Needed to get the other O_xxx flags. */
+#ifdef OPENSSL_SYS_VMS
+# include <unixio.h>
+#endif
#define INCLUDE_FUNCTION_TABLE
#include "apps.h"
-#if 1
-# define LIST_STANDARD_COMMANDS "list-standard-commands"
-# define LIST_MESSAGE_DIGEST_COMMANDS "list-message-digest-commands"
-# define LIST_MESSAGE_DIGEST_ALGORITHMS "list-message-digest-algorithms"
-# define LIST_CIPHER_COMMANDS "list-cipher-commands"
-# define LIST_CIPHER_ALGORITHMS "list-cipher-algorithms"
-# define LIST_PUBLIC_KEY_ALGORITHMS "list-public-key-algorithms"
-#endif
#ifdef OPENSSL_NO_CAMELLIA
# define FORMAT "%-15s"
DECLARE_LHASH_OF(FUNCTION);
static LHASH_OF(FUNCTION) *prog_init(void);
static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[]);
-static int list_pkey(void);
-static int list_cipher(void);
-static int list_md(void);
-static int list_type(FUNC_TYPE list_type);
+static void list_pkey(void);
+static void list_type(FUNC_TYPE ft);
char *default_config_file = NULL;
-CONF *config = NULL;
+static CONF *config = NULL;
BIO *bio_in = NULL;
BIO *bio_out = NULL;
BIO *bio_err = NULL;
ERR_load_SSL_strings();
OpenSSL_add_all_algorithms();
OpenSSL_add_ssl_algorithms();
+ OPENSSL_load_builtin_modules();
setup_ui_method();
/*SSL_library_init();*/
#ifndef OPENSSL_NO_ENGINE
CONF_modules_unload(1);
#ifndef OPENSSL_NO_COMP
COMP_zlib_cleanup();
+ SSL_COMP_free_compression_methods();
#endif
OBJ_cleanup();
EVP_cleanup();
static char *make_config_name()
{
- const char *t = X509_get_default_cert_area();
+ const char *t;
size_t len;
char *p;
- len = strlen(t) + strlen(OPENSSL_CONF) + 2;
- p = OPENSSL_malloc(len);
- if (p == NULL)
- return NULL;
- BUF_strlcpy(p, t, len);
+ if ((t = getenv("OPENSSL_CONF")) != NULL
+ || (t = getenv("SSLEAY_CONF")) != NULL)
+ return BUF_strdup(t);
+
+ t = X509_get_default_cert_area();
+ len = strlen(t) + 1 + strlen(OPENSSL_CONF) + 1;
+ p = app_malloc(len, "config filename buffer");
+ strcpy(p, t);
#ifndef OPENSSL_SYS_VMS
- BUF_strlcat(p, "/", len);
+ strcat(p, "/");
#endif
- BUF_strlcat(p, OPENSSL_CONF, len);
+ strcat(p, OPENSSL_CONF);
return p;
}
-static int load_config(CONF *cnf)
-{
- static int load_config_called = 0;
-
- if (load_config_called)
- return 1;
- load_config_called = 1;
- if (!cnf)
- cnf = config;
- if (!cnf)
- return 1;
-
- OPENSSL_load_builtin_modules();
-
- if (CONF_modules_load(cnf, NULL, 0) <= 0) {
- BIO_printf(bio_err, "Error configuring OpenSSL\n");
- ERR_print_errors(bio_err);
- return 0;
- }
- return 1;
-}
-
static void lock_dbg_cb(int mode, int type, const char *file, int line)
{
static int modes[CRYPTO_NUM_LOCKS];
err:
if (errstr) {
- /* we cannot use bio_err here */
- fprintf(stderr,
- "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
- errstr, mode, type, file, line);
- }
-}
-
-BIO *dup_bio_in(void)
-{
- return BIO_new_fp(stdin, BIO_NOCLOSE | BIO_FP_TEXT);
-}
-
-BIO *dup_bio_out(void)
-{
- BIO *b = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-#ifdef OPENSSL_SYS_VMS
- b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
-#endif
- return b;
-}
-
-void unbuffer(FILE *fp)
-{
- setbuf(fp, NULL);
-}
-
-BIO *bio_open_default(const char *filename, const char *mode)
-{
- BIO *ret;
-
- if (filename == NULL || strcmp(filename, "-") == 0) {
- ret = *mode == 'r' ? dup_bio_in() : dup_bio_out();
- if (ret != NULL)
- return ret;
- BIO_printf(bio_err,
- "Can't open %s, %s\n",
- *mode == 'r' ? "stdin" : "stdout", strerror(errno));
- } else {
- ret = BIO_new_file(filename, mode);
- if (ret != NULL)
- return ret;
BIO_printf(bio_err,
- "Can't open %s for %s, %s\n",
- filename,
- *mode == 'r' ? "reading" : "writing", strerror(errno));
+ "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
+ errstr, mode, type, file, line);
}
- ERR_print_errors(bio_err);
- return NULL;
}
#if defined( OPENSSL_SYS_VMS)
FUNCTION f, *fp;
LHASH_OF(FUNCTION) *prog = NULL;
char **copied_argv = NULL;
- char *p, *pname, *to_free = NULL;
+ char *p, *pname;
char buf[1024];
const char *prompt;
ARGS arg;
int first, n, i, ret = 0;
- long errline;
arg.argv = NULL;
arg.size = 0;
+ /* Set up some of the environment. */
+ default_config_file = make_config_name();
+ bio_in = dup_bio_in(FORMAT_TEXT);
+ bio_out = dup_bio_out(FORMAT_TEXT);
+ bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+
#if defined( OPENSSL_SYS_VMS)
copied_argv = argv = copy_argv(&argc, argv);
#endif
#ifdef OPENSSL_FIPS
if (!FIPS_mode_set(1)) {
ERR_load_crypto_strings();
- ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE));
- EXIT(1);
+ ERR_print_errors(bio_err);
+ return 1;
}
#else
- fprintf(stderr, "FIPS mode not supported.\n");
- EXIT(1);
+ BIO_printf(bio_err, "FIPS mode not supported.\n");
+ return 1;
#endif
}
prog = prog_init();
pname = opt_progname(argv[0]);
- /* Lets load up our environment a little */
- bio_in = dup_bio_in();
- bio_out = dup_bio_out();
- bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-
- /* Determine and load the config file. */
- default_config_file = getenv("OPENSSL_CONF");
- if (default_config_file == NULL)
- default_config_file = getenv("SSLEAY_CONF");
- if (default_config_file == NULL)
- default_config_file = to_free = make_config_name();
- if (!load_config(NULL))
- goto end;
- config = NCONF_new(NULL);
- i = NCONF_load(config, default_config_file, &errline);
- if (i == 0) {
- if (ERR_GET_REASON(ERR_peek_last_error())
- == CONF_R_NO_SUCH_FILE) {
- BIO_printf(bio_err,
- "%s: WARNING: can't open config file: %s\n",
- pname, default_config_file);
- ERR_clear_error();
- NCONF_free(config);
- config = NULL;
- } else {
- ERR_print_errors(bio_err);
- NCONF_free(config);
- exit(1);
- }
- }
-
/* first check the program name */
f.name = pname;
fp = lh_FUNCTION_retrieve(prog, &f);
/* ok, lets enter interactive mode */
for (;;) {
ret = 0;
- for (p = buf, n = sizeof buf, i = 0, first = 1;; first = 0) {
- prompt = first ? "OpenSSL> " : "> ";
+ /* 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 : " : "> ";
p[0] = '\0';
+#ifndef READLINE
fputs(prompt, stdout);
fflush(stdout);
if (!fgets(p, n, stdin))
i -= 2;
p += i;
n -= i;
+#else
+ {
+ extern char *readline(const char *);
+ extern void add_history(const char *cp);
+ char *text;
+
+ char *text = readline(prompt);
+ if (text == NULL)
+ goto end;
+ i = strlen(text);
+ if (i == 0 || i > n)
+ break;
+ if (text[i - 1] != '\\') {
+ p += strlen(strcpy(p, text));
+ free(text);
+ add_history(buf);
+ break;
+ }
+
+ text[i - 1] = '\0';
+ p += strlen(strcpy(p, text));
+ free(text);
+ n -= i;
+ }
+#endif
}
+
if (!chopup_args(&arg, buf)) {
BIO_printf(bio_err, "Can't parse (no memory?)\n");
break;
}
ret = 1;
end:
- if (copied_argv)
- OPENSSL_free(copied_argv);
- if (to_free)
- OPENSSL_free(to_free);
- if (config != NULL) {
- NCONF_free(config);
- config = NULL;
- }
- if (prog != NULL)
- lh_FUNCTION_free(prog);
- if (arg.argv != NULL)
- OPENSSL_free(arg.argv);
+ OPENSSL_free(copied_argv);
+ OPENSSL_free(default_config_file);
+ NCONF_free(config);
+ config = NULL;
+ lh_FUNCTION_free(prog);
+ OPENSSL_free(arg.argv);
BIO_free(bio_in);
BIO_free_all(bio_out);
apps_shutdown();
- /*CRYPTO_mem_leaks(bio_err);
- */
+ CRYPTO_mem_leaks(bio_err);
BIO_free(bio_err);
return (ret);
}
{NULL}
};
+static void list_cipher_fn(const EVP_CIPHER *c,
+ const char *from, const char *to, void *arg)
+{
+ if (c)
+ BIO_printf(arg, "%s\n", EVP_CIPHER_name(c));
+ else {
+ if (!from)
+ from = "<undefined>";
+ if (!to)
+ to = "<undefined>";
+ BIO_printf(arg, "%s => %s\n", from, to);
+ }
+}
+
+static void list_md_fn(const EVP_MD *m,
+ const char *from, const char *to, void *arg)
+{
+ if (m)
+ BIO_printf(arg, "%s\n", EVP_MD_name(m));
+ else {
+ if (!from)
+ from = "<undefined>";
+ if (!to)
+ to = "<undefined>";
+ BIO_printf((BIO *)arg, "%s => %s\n", from, to);
+ }
+}
+
/* Unified enum for help and list commands. */
typedef enum HELPLIST_CHOICE {
OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
opt_help(list_options);
break;
case OPT_COMMANDS:
- return list_type(FT_general);
+ list_type(FT_general);
+ break;
case OPT_DIGEST_COMMANDS:
- return list_type(FT_md);
+ list_type(FT_md);
+ break;
case OPT_DIGEST_ALGORITHMS:
- return list_md();
+ EVP_MD_do_all_sorted(list_md_fn, bio_out);
+ break;
case OPT_CIPHER_COMMANDS:
- return list_type(FT_cipher);
+ list_type(FT_cipher);
+ break;
case OPT_CIPHER_ALGORITHMS:
- return list_cipher();
+ EVP_CIPHER_do_all_sorted(list_cipher_fn, bio_out);
+ break;
case OPT_PK_ALGORITHMS:
- return list_pkey();
+ list_pkey();
+ break;
}
}
return EXIT_THE_PROGRAM;
}
-static int list_type(FUNC_TYPE flist_type)
+static void list_type(FUNC_TYPE ft)
{
FUNCTION *fp;
int i = 0;
for (fp = functions; fp->name != NULL; fp++)
- if (fp->type == flist_type) {
+ if (fp->type == ft) {
if ((i++ % COLUMNS) == 0)
BIO_printf(bio_out, "\n");
BIO_printf(bio_out, FORMAT, fp->name);
}
BIO_printf(bio_out, "\n");
- return 0;
}
static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
strcmp(argv[0], "exit") == 0 || strcmp(argv[0], "bye") == 0)
/* Special value to mean "exit the program. */
return EXIT_THE_PROGRAM;
-#ifdef LIST_STANDARD_COMMANDS
- if (strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0)
- return list_type(FT_general);
- if (strcmp(argv[0], LIST_MESSAGE_DIGEST_ALGORITHMS) == 0)
- return list_md();
- if (strcmp(argv[0], LIST_PUBLIC_KEY_ALGORITHMS) == 0)
- return list_pkey();
- if (strcmp(argv[0], LIST_CIPHER_ALGORITHMS) == 0)
- return list_cipher();
- if (strcmp(argv[0], LIST_CIPHER_COMMANDS) == 0)
- return list_type(FT_cipher);
- if (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0)
- return list_type(FT_md);
-#endif
BIO_printf(bio_err, "Invalid command '%s'; type \"help\" for a list.\n",
argv[0]);
return (1);
}
-static int list_pkey(void)
+static void list_pkey(void)
{
int i;
}
}
- return 0;
-}
-
-static void list_cipher_fn(const EVP_CIPHER *c,
- const char *from, const char *to, void *arg)
-{
- if (c)
- BIO_printf(arg, "%s\n", EVP_CIPHER_name(c));
- else {
- if (!from)
- from = "<undefined>";
- if (!to)
- to = "<undefined>";
- BIO_printf(arg, "%s => %s\n", from, to);
- }
-}
-
-static int list_cipher(void)
-{
- EVP_CIPHER_do_all_sorted(list_cipher_fn, bio_out);
- return 0;
-}
-
-static void list_md_fn(const EVP_MD *m,
- const char *from, const char *to, void *arg)
-{
- if (m)
- BIO_printf(arg, "%s\n", EVP_MD_name(m));
- else {
- if (!from)
- from = "<undefined>";
- if (!to)
- to = "<undefined>";
- BIO_printf((BIO *)arg, "%s => %s\n", from, to);
- }
-}
-
-static int list_md(void)
-{
- EVP_MD_do_all_sorted(list_md_fn, bio_out);
- return 0;
}
static int function_cmp(const FUNCTION * a, const FUNCTION * b)
/* Sort alphabetically within category. For nicer help displays. */
for (i = 0, f = functions; f->name != NULL; ++f, ++i) ;
- qsort(functions, i, sizeof *functions, SortFnByName);
+ qsort(functions, i, sizeof(*functions), SortFnByName);
if ((ret = lh_FUNCTION_new()) == NULL)
return (NULL);
projects / openssl.git / blobdiff