Make it possible to disable OCSP, the speed application, and the use of sockets.

PR: 358
This commit is contained in:
Richard Levitte 2003-02-14 01:02:58 +00:00
parent 2d3de726c5
commit 85d686e723
6 changed files with 27 additions and 0 deletions

View File

@ -55,6 +55,7 @@
* Hudson (tjh@cryptsoft.com). * Hudson (tjh@cryptsoft.com).
* *
*/ */
#ifndef OPENSSL_NO_OCSP
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -722,7 +723,12 @@ int MAIN(int argc, char **argv)
} }
else if (host) else if (host)
{ {
#ifndef OPENSSL_NO_SOCK
cbio = BIO_new_connect(host); cbio = BIO_new_connect(host);
#else
BIO_printf(bio_err, "Error creating connect BIO - sockets not supported.\n");
goto end;
#endif
if (!cbio) if (!cbio)
{ {
BIO_printf(bio_err, "Error creating connect BIO\n"); 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()); bufbio = BIO_new(BIO_f_buffer());
if (!bufbio) if (!bufbio)
goto err; goto err;
#ifndef OPENSSL_NO_SOCK
acbio = BIO_new_accept(port); acbio = BIO_new_accept(port);
#else
BIO_printf(bio_err, "Error setting up accept BIO - sockets not supported.\n");
#endif
if (!acbio) if (!acbio)
goto err; goto err;
BIO_set_accept_bios(acbio, bufbio); BIO_set_accept_bios(acbio, bufbio);
@ -1226,3 +1236,4 @@ static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp)
return 1; return 1;
} }
#endif

View File

@ -102,7 +102,9 @@ FUNCTION functions[] = {
#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
{FUNC_TYPE_GENERAL,"s_client",s_client_main}, {FUNC_TYPE_GENERAL,"s_client",s_client_main},
#endif #endif
#ifndef OPENSSL_NO_SPEED
{FUNC_TYPE_GENERAL,"speed",speed_main}, {FUNC_TYPE_GENERAL,"speed",speed_main},
#endif
#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
{FUNC_TYPE_GENERAL,"s_time",s_time_main}, {FUNC_TYPE_GENERAL,"s_time",s_time_main},
#endif #endif

View File

@ -71,6 +71,8 @@
/* most of this code has been pilfered from my libdes speed.c program */ /* most of this code has been pilfered from my libdes speed.c program */
#ifndef OPENSSL_NO_SPEED
#undef SECONDS #undef SECONDS
#define SECONDS 3 #define SECONDS 3
#define RSA_SECONDS 10 #define RSA_SECONDS 10
@ -2579,3 +2581,4 @@ static int do_multi(int multi)
return 1; return 1;
} }
#endif #endif
#endif

View File

@ -90,17 +90,23 @@ static X509V3_EXT_METHOD *standard_exts[] = {
&v3_crld, &v3_crld,
&v3_ext_ku, &v3_ext_ku,
&v3_crl_reason, &v3_crl_reason,
#ifndef OPENSSL_NO_OCSP
&v3_crl_invdate, &v3_crl_invdate,
#endif
&v3_sxnet, &v3_sxnet,
&v3_info, &v3_info,
#ifndef OPENSSL_NO_OCSP
&v3_ocsp_nonce, &v3_ocsp_nonce,
&v3_ocsp_crlid, &v3_ocsp_crlid,
&v3_ocsp_accresp, &v3_ocsp_accresp,
&v3_ocsp_nocheck, &v3_ocsp_nocheck,
&v3_ocsp_acutoff, &v3_ocsp_acutoff,
&v3_ocsp_serviceloc, &v3_ocsp_serviceloc,
#endif
&v3_sinfo, &v3_sinfo,
#ifndef OPENSSL_NO_OCSP
&v3_crl_hold &v3_crl_hold
#endif
}; };
/* Number of standard extensions */ /* Number of standard extensions */

View File

@ -56,6 +56,8 @@
* *
*/ */
#ifndef OPENSSL_NO_OCSP
#include <stdio.h> #include <stdio.h>
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/conf.h> #include <openssl/conf.h>
@ -270,3 +272,4 @@ static int i2r_ocsp_serviceloc(X509V3_EXT_METHOD *method, void *in, BIO *bp, int
err: err:
return 0; return 0;
} }
#endif

View File

@ -513,6 +513,7 @@ static int ssl_puts(BIO *bp, const char *str)
BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx) BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
{ {
#ifndef OPENSSL_NO_SOCK
BIO *ret=NULL,*buf=NULL,*ssl=NULL; BIO *ret=NULL,*buf=NULL,*ssl=NULL;
if ((buf=BIO_new(BIO_f_buffer())) == NULL) if ((buf=BIO_new(BIO_f_buffer())) == NULL)
@ -525,6 +526,7 @@ BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
err: err:
if (buf != NULL) BIO_free(buf); if (buf != NULL) BIO_free(buf);
if (ssl != NULL) BIO_free(ssl); if (ssl != NULL) BIO_free(ssl);
#endif
return(NULL); return(NULL);
} }