generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GH463: Fix OPENSSL_NO_OCSP build

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

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Rich Salz
2016-02-25 00:56:35 -05:00
committed by Rich Salz
parent f2adbd85dd
commit 5d3222876e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/apps.c
View File

@@ -627,7 +627,8 @@ static int load_pkcs12(BIO *in, const char *desc,
return ret; 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; char *host = NULL, *port = NULL, *path = NULL;
BIO *bio = NULL; BIO *bio = NULL;
@@ -673,6 +674,7 @@ int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl)
} }
return rv; return rv;
} }
#endif
X509 *load_cert(const char *file, int format, const char *cert_descrip) 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; BIO *cert;
if (format == FORMAT_HTTP) { if (format == FORMAT_HTTP) {
#ifndef OPENSSL_NO_OCSP
load_cert_crl_http(file, &x, NULL); load_cert_crl_http(file, &x, NULL);
#endif
return x; return x;
} }
@@ -719,7 +723,9 @@ X509_CRL *load_crl(const char *infile, int format)
BIO *in = NULL; BIO *in = NULL;
if (format == FORMAT_HTTP) { if (format == FORMAT_HTTP) {
#ifndef OPENSSL_NO_OCSP
load_cert_crl_http(infile, NULL, &x); load_cert_crl_http(infile, NULL, &x);
#endif
return x; return x;
} }

1
apps/apps.h
View File

@@ -477,7 +477,6 @@ int app_passwd(char *arg1, char *arg2, char **pass1, char **pass2);
int add_oid_section(CONF *conf); int add_oid_section(CONF *conf);
X509 *load_cert(const char *file, int format, const char *cert_descrip); X509 *load_cert(const char *file, int format, const char *cert_descrip);
X509_CRL *load_crl(const char *infile, int format); 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, EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
const char *pass, ENGINE *e, const char *key_descrip); const char *pass, ENGINE *e, const char *key_descrip);
EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin, EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,