Fix openssl passwd -1

[oweals/openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 7b6a2b0a2d6c3e1715deb41059284d26b4f8b817..b5932832569a693eb6db6e883d33226ea8214eb9 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -83,7 +83,6 @@ typedef unsigned int u_int;
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
-#include <openssl/engine.h>
 #include "s_apps.h"
 
 #ifdef WINDOWS
@@ -177,7 +176,6 @@ static int s_debug=0;
 static int s_quiet=0;
 
 static int hack=0;
-static char *engine_id=NULL;
 
 #ifdef MONOLITH
 static void s_server_init(void)
@@ -200,7 +198,6 @@ static void s_server_init(void)
        s_debug=0;
        s_quiet=0;
        hack=0;
-       engine_id=NULL;
        }
 #endif
 
@@ -245,7 +242,6 @@ static void sv_usage(void)
        BIO_printf(bio_err," -bugs         - Turn on SSL bug compatibility\n");
        BIO_printf(bio_err," -www          - Respond to a 'GET /' with a status page\n");
        BIO_printf(bio_err," -WWW          - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n");
-       BIO_printf(bio_err," -engine id    - Initialise and use the specified engine\n");
        }
 
 static int local_argc=0;
@@ -415,7 +411,9 @@ int MAIN(int argc, char *argv[])
        int no_tmp_rsa=0,no_dhe=0,nocert=0;
        int state=0;
        SSL_METHOD *meth=NULL;
-       ENGINE *e=NULL;
+#ifndef NO_DH
+       DH *dh=NULL;
+#endif
 
 #if !defined(NO_SSL2) && !defined(NO_SSL3)
        meth=SSLv23_server_method();
@@ -567,11 +565,6 @@ int MAIN(int argc, char *argv[])
                else if (strcmp(*argv,"-tls1") == 0)
                        { meth=TLSv1_server_method(); }
 #endif
-               else if (strcmp(*argv,"-engine") == 0)
-                       {
-                       if (--argc < 1) goto bad;
-                       engine_id= *(++argv);
-                       }
                else
                        {
                        BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -616,29 +609,6 @@ bad:
        SSL_load_error_strings();
        OpenSSL_add_ssl_algorithms();
 
-       if (engine_id != NULL)
-               {
-               if((e = ENGINE_by_id(engine_id)) == NULL)
-                       {
-                       BIO_printf(bio_err,"invalid engine\n");
-                       ERR_print_errors(bio_err);
-                       goto end;
-                       }
-               if (s_debug)
-                       {
-                       ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM,
-                               0, bio_err, 0);
-                       }
-               if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-                       {
-                       BIO_printf(bio_err,"can't use that engine\n");
-                       ERR_print_errors(bio_err);
-                       goto end;
-                       }
-               BIO_printf(bio_err,"engine \"%s\" set.\n", engine_id);
-               ENGINE_free(e);
-               }
-
        ctx=SSL_CTX_new(meth);
        if (ctx == NULL)
                {
@@ -679,13 +649,7 @@ bad:
 #ifndef NO_DH
        if (!no_dhe)
                {
-               DH *dh=NULL;
-
-               if (dhfile)
-                       dh = load_dh_param(dhfile);
-               else if (s_cert_file)
-                       dh = load_dh_param(s_cert_file);
-
+               dh=load_dh_param(dhfile ? dhfile : s_cert_file);
                if (dh != NULL)
                        {
                        BIO_printf(bio_s_out,"Setting temp DH parameters\n");