Commit 5d322287 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

GH463: Fix OPENSSL_NO_OCSP build 



Fixes github issue 463.  Building the app without OPENSSL_NO_SOCK
isn't supported, so only do OPENSSL_NO_OCSP.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent f2adbd85

apps/apps.c

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

}



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

#ifndef OPENSSL_NO_OCSP

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

{

    char *host = NULL, *port = NULL, *path = NULL;

    BIO *bio = NULL;
@@ -673,6 +674,7 @@ int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl) 
    }

    return rv;

}

#endif



X509 *load_cert(const char *file, int format, const char *cert_descrip)

{
@@ -680,7 +682,9 @@ X509 *load_cert(const char *file, int format, const char *cert_descrip) 
    BIO *cert;



    if (format == FORMAT_HTTP) {

#ifndef OPENSSL_NO_OCSP

        load_cert_crl_http(file, &x, NULL);

#endif

        return x;

    }
@@ -719,7 +723,9 @@ X509_CRL *load_crl(const char *infile, int format) 
    BIO *in = NULL;



    if (format == FORMAT_HTTP) {

#ifndef OPENSSL_NO_OCSP

        load_cert_crl_http(infile, NULL, &x);

#endif

        return x;

    }

apps/apps.h

+0 −1
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ int app_passwd(char *arg1, char *arg2, char **pass1, char **pass2); 
int add_oid_section(CONF *conf);

X509 *load_cert(const char *file, int format, const char *cert_descrip);

X509_CRL *load_crl(const char *infile, int format);

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

EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,

                   const char *pass, ENGINE *e, const char *key_descrip);

EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,