Remove OPENSSL_NO_SHA guards

[openssl.git] / apps / openssl.c

diff --git a/apps/openssl.c b/apps/openssl.c
index 166c7a1e45b0bf9c1b610c75e8804206ba960cb9..775dc9f6941bfcd376aaae780cb72ddc4c0f2062 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -176,14 +176,18 @@ static int apps_startup()
                              | OPENSSL_INIT_LOAD_CONFIG, NULL))
         return 0;
 
+#ifndef OPENSSL_NO_UI
     setup_ui_method();
+#endif
 
     return 1;
 }
 
 static void apps_shutdown()
 {
+#ifndef OPENSSL_NO_UI
     destroy_ui_method();
+#endif
 }
 
 static char *make_config_name()
@@ -212,7 +216,6 @@ int main(int argc, char *argv[])
     FUNCTION f, *fp;
     LHASH_OF(FUNCTION) *prog = NULL;
     char **copied_argv = NULL;
-    char **argv_alias  = NULL;
     char *p, *pname;
     char buf[1024];
     const char *prompt;
@@ -228,10 +231,8 @@ int main(int argc, char *argv[])
     bio_out = dup_bio_out(FORMAT_TEXT);
     bio_err = dup_bio_err(FORMAT_TEXT);
 
-#if defined( OPENSSL_SYS_VMS) && defined(__DECC)
-    copied_argv = argv_alias = copy_argv(&argc, argv);
-#else
-    argv_alias = argv;
+#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
+    copied_argv = argv = copy_argv(&argc, argv);
 #endif
 
     p = getenv("OPENSSL_DEBUG_MEMORY");
@@ -255,22 +256,22 @@ int main(int argc, char *argv[])
         goto end;
 
     prog = prog_init();
-    pname = opt_progname(argv_alias[0]);
+    pname = opt_progname(argv[0]);
 
     /* first check the program name */
     f.name = pname;
     fp = lh_FUNCTION_retrieve(prog, &f);
     if (fp != NULL) {
-        argv_alias[0] = pname;
-        ret = fp->func(argc, argv_alias);
+        argv[0] = pname;
+        ret = fp->func(argc, argv);
         goto end;
     }
 
     /* If there is stuff on the command line, run with that. */
     if (argc != 1) {
         argc--;
-        argv_alias++;
-        ret = do_cmd(prog, argc, argv_alias);
+        argv++;
+        ret = do_cmd(prog, argc, argv);
         if (ret < 0)
             ret = 0;
         goto end;
@@ -643,9 +644,6 @@ static int SortFnByName(const void *_f1, const void *_f2)
 static void list_disabled(void)
 {
     BIO_puts(bio_out, "Disabled algorithms:\n");
-#ifdef OPENSSL_NO_AES
-    BIO_puts(bio_out, "AES\n");
-#endif
 #ifdef OPENSSL_NO_BF
     BIO_puts(bio_out, "BF\n");
 #endif
@@ -757,9 +755,6 @@ static void list_disabled(void)
 #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