diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-02-14 04:03:06 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-02-14 04:03:06 +0300 |
| commit | b9447ec1bc3af45325559cb1257482bc28e10125 (patch) | |
| tree | 1e35b92ba054cee803a07915f76d0d7a535e1bb3 /apps | |
| parent | 73bec6d4b74518c594678ae6e35dae13211157c0 (diff) | |
Make it possible to disable OCSP, the speed application, and the use of sockets.
PR: 358
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ocsp.c | 11 | ||||
| -rw-r--r-- | apps/progs.h | 2 | ||||
| -rw-r--r-- | apps/speed.c | 3 |
3 files changed, 16 insertions, 0 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index 92922bc8ad..6182410f6a 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -55,6 +55,7 @@ * Hudson (tjh@cryptsoft.com). * */ +#ifndef OPENSSL_NO_OCSP #include <stdio.h> #include <string.h> @@ -722,7 +723,12 @@ int MAIN(int argc, char **argv) } else if (host) { +#ifndef OPENSSL_NO_SOCK cbio = BIO_new_connect(host); +#else + BIO_printf(bio_err, "Error creating connect BIO - sockets not supported.\n"); + goto end; +#endif if (!cbio) { BIO_printf(bio_err, "Error creating connect BIO\n"); @@ -1139,7 +1145,11 @@ static BIO *init_responder(char *port) bufbio = BIO_new(BIO_f_buffer()); if (!bufbio) goto err; +#ifndef OPENSSL_NO_SOCK acbio = BIO_new_accept(port); +#else + BIO_printf(bio_err, "Error setting up accept BIO - sockets not supported.\n"); +#endif if (!acbio) goto err; BIO_set_accept_bios(acbio, bufbio); @@ -1226,3 +1236,4 @@ static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp) return 1; } +#endif diff --git a/apps/progs.h b/apps/progs.h index a8d3b329dc..70e4dbac07 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -94,7 +94,9 @@ FUNCTION functions[] = { #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) {FUNC_TYPE_GENERAL,"s_client",s_client_main}, #endif +#ifndef OPENSSL_NO_SPEED {FUNC_TYPE_GENERAL,"speed",speed_main}, +#endif #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) {FUNC_TYPE_GENERAL,"s_time",s_time_main}, #endif diff --git a/apps/speed.c b/apps/speed.c index f2cbecc953..ec55b4188c 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -58,6 +58,8 @@ /* most of this code has been pilfered from my libdes speed.c program */ +#ifndef OPENSSL_NO_SPEED + #undef SECONDS #define SECONDS 3 #define RSA_SECONDS 10 @@ -1946,3 +1948,4 @@ static int do_multi(int multi) return 1; } #endif +#endif |