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

PR: 358

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 92922bc8ad6f0568bac17dd4eb969cef316407b7..6182410f6ad740b903e1e1f28dc84b5e7a8d3e63 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -55,6 +55,7 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
  * Hudson (tjh@cryptsoft.com).
  *
  */

+#ifndef OPENSSL_NO_OCSP

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.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)
                        {
                        BIO_printf(bio_err, "Error creating connect BIO\n");
                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;
        bufbio = BIO_new(BIO_f_buffer());
        if (!bufbio) 
                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)
                goto err;
        BIO_set_accept_bios(acbio, bufbio);
        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;
        }
 
        return 1;
        }
 

+#endif

diff --git a/apps/progs.h b/apps/progs.h
index b551e1de95b479026fda02cd3d957764344acfc8..131a721a3920ab8fa92d9ce72eadaccdb5da6a40 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -102,7 +102,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
 #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},
        {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
 #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 df892c51fb2b06df8db0ba63b287be8c020f0157..8a2abf73d3093ac925c9e41abcea16f2650d79c9 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -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
 #define SECONDS                3       
 #define RSA_SECONDS    10
 #undef SECONDS
 #define SECONDS                3       
 #define RSA_SECONDS    10


@@ -2579,3 +2581,4 @@ static int do_multi(int multi)
        return 1;
        }
 #endif
        return 1;
        }
 #endif

+#endif

diff --git a/crypto/x509v3/ext_dat.h b/crypto/x509v3/ext_dat.h
index 2fb97d89254d2828baf8e3dfb934e179cff257b4..5442480595b371de6d9ce64f507c73469681ab10 100644 (file)
--- a/crypto/x509v3/ext_dat.h
+++ b/crypto/x509v3/ext_dat.h
@@ -90,17 +90,23 @@ static X509V3_EXT_METHOD *standard_exts[] = {
 &v3_crld,
 &v3_ext_ku,
 &v3_crl_reason,
 &v3_crld,
 &v3_ext_ku,
 &v3_crl_reason,

+#ifndef OPENSSL_NO_OCSP

 &v3_crl_invdate,
 &v3_crl_invdate,

+#endif

 &v3_sxnet,
 &v3_info,
 &v3_sxnet,
 &v3_info,

+#ifndef OPENSSL_NO_OCSP

 &v3_ocsp_nonce,
 &v3_ocsp_crlid,
 &v3_ocsp_accresp,
 &v3_ocsp_nocheck,
 &v3_ocsp_acutoff,
 &v3_ocsp_serviceloc,
 &v3_ocsp_nonce,
 &v3_ocsp_crlid,
 &v3_ocsp_accresp,
 &v3_ocsp_nocheck,
 &v3_ocsp_acutoff,
 &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 */

diff --git a/crypto/x509v3/v3_ocsp.c b/crypto/x509v3/v3_ocsp.c
index 083112314e6121c926983d8781e71cd2b253fa35..21badc13f9f01f6328531c0f2175fae8a90fa64f 100644 (file)
--- a/crypto/x509v3/v3_ocsp.c
+++ b/crypto/x509v3/v3_ocsp.c
@@ -56,6 +56,8 @@
  *
  */
 
  *
  */
 

+#ifndef OPENSSL_NO_OCSP
+

 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/conf.h>
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/conf.h>


@@ -270,3 +272,4 @@ static int i2r_ocsp_serviceloc(X509V3_EXT_METHOD *method, void *in, BIO *bp, int
 err:
        return 0;
        }
 err:
        return 0;
        }

+#endif

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 1301549e21ff60b4e800bed41307ae8691a187b4..d683ee43e192fabeb751cf9707956f44e9085dde 100644 (file)
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -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;
 
        if ((buf=BIO_new(BIO_f_buffer())) == NULL)
        BIO *ret=NULL,*buf=NULL,*ssl=NULL;
 
        if ((buf=BIO_new(BIO_f_buffer())) == NULL)


@@ -525,6 +526,7 @@ BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
 err:
        if (buf != NULL) BIO_free(buf);
        if (ssl != NULL) BIO_free(ssl);
 err:
        if (buf != NULL) BIO_free(buf);
        if (ssl != NULL) BIO_free(ssl);

+#endif

        return(NULL);
        }
 
        return(NULL);
        }