diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-01-30 17:39:26 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-01-30 17:39:26 +0000 |
| commit | 0b13e9f055d3f7be066dc2e89fc9f9822b12eca7 (patch) | |
| tree | 633b5d3e4c9356eaf9816541aaa079a0c3be9194 /apps/s_server.c | |
| parent | 96f7065f6392e19f1449578aaeabb8dc39294fa7 (diff) | |
| download | openssl-0b13e9f055d3f7be066dc2e89fc9f9822b12eca7.tar.gz | |
Add the possibility to build without the ENGINE framework.
PR: 287
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 39013c2b0b..814f3b9c15 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -255,7 +255,9 @@ static int s_msg=0; static int s_quiet=0; static int hack=0; +#ifndef OPENSSL_NO_ENGINE static char *engine_id=NULL; +#endif static const char *session_id_prefix=NULL; #ifdef MONOLITH @@ -280,7 +282,9 @@ static void s_server_init(void) s_msg=0; s_quiet=0; hack=0; +#ifndef OPENSSL_NO_ENGINE engine_id=NULL; +#endif } #endif @@ -337,7 +341,9 @@ static void sv_usage(void) BIO_printf(bio_err," -WWW - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n"); BIO_printf(bio_err," -HTTP - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n"); BIO_printf(bio_err," with the assumption it contains a complete HTTP response.\n"); +#ifndef OPENSSL_NO_ENGINE BIO_printf(bio_err," -engine id - Initialise and use the specified engine\n"); +#endif BIO_printf(bio_err," -id_prefix arg - Generate SSL/TLS session IDs prefixed by 'arg'\n"); BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); } @@ -512,7 +518,9 @@ int MAIN(int argc, char *argv[]) int no_tmp_rsa=0,no_dhe=0,no_ecdhe=0,nocert=0; int state=0; SSL_METHOD *meth=NULL; +#ifndef OPENSSL_NO_ENGINE ENGINE *e=NULL; +#endif char *inrand=NULL; #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3) @@ -696,11 +704,13 @@ int MAIN(int argc, char *argv[]) if (--argc < 1) goto bad; session_id_prefix = *(++argv); } +#ifndef OPENSSL_NO_ENGINE else if (strcmp(*argv,"-engine") == 0) { if (--argc < 1) goto bad; engine_id= *(++argv); } +#endif else if (strcmp(*argv,"-rand") == 0) { if (--argc < 1) goto bad; @@ -725,7 +735,9 @@ bad: SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); +#ifndef OPENSSL_NO_ENGINE e = setup_engine(bio_err, engine_id, 1); +#endif if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL && !RAND_status()) |