Commit f9e55034 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-sock 



Misc fixes for no-sock

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 168c3b73

apps/apps.c

+3 −3
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static int load_pkcs12(BIO *in, const char *desc, 
    return ret;

}



#ifndef OPENSSL_NO_OCSP

#if !defined(OPENSSL_NO_OCSP) && !defined(OPENSSL_NO_SOCK)

static int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl)

{

    char *host = NULL, *port = NULL, *path = NULL;
@@ -695,7 +695,7 @@ X509 *load_cert(const char *file, int format, const char *cert_descrip) 
    BIO *cert;



    if (format == FORMAT_HTTP) {

#ifndef OPENSSL_NO_OCSP

#if !defined(OPENSSL_NO_OCSP) && !defined(OPENSSL_NO_SOCK)

        load_cert_crl_http(file, &x, NULL);

#endif

        return x;
@@ -736,7 +736,7 @@ X509_CRL *load_crl(const char *infile, int format) 
    BIO *in = NULL;



    if (format == FORMAT_HTTP) {

#ifndef OPENSSL_NO_OCSP

#if !defined(OPENSSL_NO_OCSP) && !defined(OPENSSL_NO_SOCK)

        load_cert_crl_http(infile, NULL, &x);

#endif

        return x;

apps/ocsp.c

+11 −1
Original line number Diff line number Diff line
@@ -117,10 +117,13 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser); 
static BIO *init_responder(const char *port);

static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio);

static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp);



# ifndef OPENSSL_NO_SOCK

static OCSP_RESPONSE *query_responder(BIO *cbio, const char *host,

                                      const char *path,

                                      const STACK_OF(CONF_VALUE) *headers,

                                      OCSP_REQUEST *req, int req_timeout);

# endif



typedef enum OPTION_choice {

    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
@@ -244,7 +247,10 @@ int ocsp_main(int argc, char **argv) 
    int noCAfile = 0, noCApath = 0;

    int accept_count = -1, add_nonce = 1, noverify = 0, use_ssl = -1;

    int vpmtouched = 0, badsig = 0, i, ignore_err = 0, nmin = 0, ndays = -1;

    int req_text = 0, resp_text = 0, req_timeout = -1, ret = 1;

    int req_text = 0, resp_text = 0, ret = 1;

#ifndef OPENSSL_NO_SOCK

    int req_timeout = -1;

#endif

    long nsec = MAX_VALIDITY_PERIOD, maxage = -1;

    unsigned long sign_flags = 0, verify_flags = 0, rflags = 0;

    OPTION_CHOICE o;
@@ -275,7 +281,9 @@ int ocsp_main(int argc, char **argv) 
            outfile = opt_arg();

            break;

        case OPT_TIMEOUT:

#ifndef OPENSSL_NO_SOCK

            req_timeout = atoi(opt_arg());

#endif

            break;

        case OPT_URL:

            OPENSSL_free(thost);
@@ -1170,6 +1178,7 @@ static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp) 
    return 1;

}



# ifndef OPENSSL_NO_SOCK

static OCSP_RESPONSE *query_responder(BIO *cbio, const char *host,

                                      const char *path,

                                      const STACK_OF(CONF_VALUE) *headers,
@@ -1300,5 +1309,6 @@ OCSP_RESPONSE *process_responder(OCSP_REQUEST *req, 
    SSL_CTX_free(ctx);

    return resp;

}

# endif



#endif

apps/s_cb.c

+4 −0
Original line number Diff line number Diff line
@@ -131,8 +131,10 @@ int verify_depth = 0; 
int verify_quiet = 0;

int verify_error = X509_V_OK;

int verify_return_error = 0;

#ifndef OPENSSL_NO_SOCK

static unsigned char cookie_secret[COOKIE_SECRET_LENGTH];

static int cookie_initialized = 0;

#endif



static const char *lookup(int val, const STRINT_PAIR* list, const char* def)

{
@@ -741,6 +743,7 @@ void tlsext_cb(SSL *s, int client_server, int type, 
    (void)BIO_flush(bio);

}



#ifndef OPENSSL_NO_SOCK

int generate_cookie_callback(SSL *ssl, unsigned char *cookie,

                             unsigned int *cookie_len)

{
@@ -803,6 +806,7 @@ int verify_cookie_callback(SSL *ssl, const unsigned char *cookie, 


    return 0;

}

#endif



/*

 * Example of extended certificate handling. Where the standard support of

apps/s_client.c

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ 
#include <errno.h>

#include <openssl/e_os2.h>



#ifndef OPENSSL_NO_SOCK



/*

 * With IPv6, it looks like Digital has mixed up the proper order of

 * recursive header file inclusion, resulting in the compiler complaining
@@ -2757,3 +2759,5 @@ static int ocsp_resp_cb(SSL *s, void *arg) 
    OCSP_RESPONSE_free(rsp);

    return 1;

}



#endif

apps/s_server.c

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ 


#include <openssl/e_os2.h>



#ifndef OPENSSL_NO_SOCK



/*

 * With IPv6, it looks like Digital has mixed up the proper order of

 * recursive header file inclusion, resulting in the compiler complaining
@@ -3363,3 +3365,5 @@ static void free_sessions(void) 
    }

    first = NULL;

}



#endif