dup_bio_* and bio_open_* are utility functions and belong in apps.c

[openssl.git] / apps / openssl.c

diff --git a/apps/openssl.c b/apps/openssl.c
index fa3b6837f9652ba78007831383117e65291b7429..0208289fb6a655fbe15cd0888ac0f4fdce68a213 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -122,13 +122,16 @@
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
 #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
 #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"
 
 #define INCLUDE_FUNCTION_TABLE
 #include "apps.h"
 


@@ -172,6 +175,7 @@ static void apps_startup()
     ERR_load_SSL_strings();
     OpenSSL_add_all_algorithms();
     OpenSSL_add_ssl_algorithms();
     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
     setup_ui_method();
     /*SSL_library_init();*/
 #ifndef OPENSSL_NO_ENGINE


@@ -188,6 +192,7 @@ static void apps_shutdown()
     CONF_modules_unload(1);
 #ifndef OPENSSL_NO_COMP
     COMP_zlib_cleanup();
     CONF_modules_unload(1);
 #ifndef OPENSSL_NO_COMP
     COMP_zlib_cleanup();

+    SSL_COMP_free_compression_methods();

 #endif
     OBJ_cleanup();
     EVP_cleanup();
 #endif
     OBJ_cleanup();
     EVP_cleanup();


@@ -199,43 +204,26 @@ static void apps_shutdown()
 
 static char *make_config_name()
 {
 
 static char *make_config_name()
 {

-    const char *t = X509_get_default_cert_area();
+    const char *t;

     size_t len;
     char *p;
 
     size_t len;
     char *p;
 

-    len = strlen(t) + strlen(OPENSSL_CONF) + 2;
+    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");
     p = app_malloc(len, "config filename buffer");

-    BUF_strlcpy(p, t, len);
+    strcpy(p, t);

 #ifndef OPENSSL_SYS_VMS
 #ifndef OPENSSL_SYS_VMS

-    BUF_strlcat(p, "/", len);
+    strcat(p, "/");

 #endif
 #endif

-    BUF_strlcat(p, OPENSSL_CONF, len);
+    strcat(p, OPENSSL_CONF);

 
     return p;
 }
 
 
     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];
 static void lock_dbg_cb(int mode, int type, const char *file, int line)
 {
     static int modes[CRYPTO_NUM_LOCKS];


@@ -279,54 +267,10 @@ static void lock_dbg_cb(int mode, int type, const char *file, int line)
 
  err:
     if (errstr) {
 
  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,
         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)
 }
 
 #if defined( OPENSSL_SYS_VMS)


@@ -338,16 +282,21 @@ int main(int argc, char *argv[])
     FUNCTION f, *fp;
     LHASH_OF(FUNCTION) *prog = NULL;
     char **copied_argv = NULL;
     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;
     char buf[1024];
     const char *prompt;
     ARGS arg;
     int first, n, i, ret = 0;

-    long errline;

 
     arg.argv = NULL;
     arg.size = 0;
 
 
     arg.argv = NULL;
     arg.size = 0;
 

+    /* Set up some of the environment. */
+    default_config_file = make_config_name();
+    bio_in = dup_bio_in();
+    bio_out = dup_bio_out();
+    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+

 #if defined( OPENSSL_SYS_VMS)
     copied_argv = argv = copy_argv(&argc, argv);
 #endif
 #if defined( OPENSSL_SYS_VMS)
     copied_argv = argv = copy_argv(&argc, argv);
 #endif


@@ -369,12 +318,12 @@ int main(int argc, char *argv[])
 #ifdef OPENSSL_FIPS
         if (!FIPS_mode_set(1)) {
             ERR_load_crypto_strings();
 #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
         }
 #else

-        fprintf(stderr, "FIPS mode not supported.\n");
-        EXIT(1);
+        BIO_printf(bio_err, "FIPS mode not supported.\n");
+        return 1;

 #endif
     }
 
 #endif
     }
 


@@ -393,37 +342,6 @@ int main(int argc, char *argv[])
     prog = prog_init();
     pname = opt_progname(argv[0]);
 
     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);
     /* first check the program name */
     f.name = pname;
     fp = lh_FUNCTION_retrieve(prog, &f);


@@ -510,7 +428,7 @@ int main(int argc, char *argv[])
     ret = 1;
  end:
     OPENSSL_free(copied_argv);
     ret = 1;
  end:
     OPENSSL_free(copied_argv);

-    OPENSSL_free(to_free);
+    OPENSSL_free(default_config_file);

     NCONF_free(config);
     config = NULL;
     lh_FUNCTION_free(prog);
     NCONF_free(config);
     config = NULL;
     lh_FUNCTION_free(prog);