[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5d3222876e7cbd8bf87fb3b9c951cba3c9be08eb (commit)
      from  f2adbd85ddb86e508efe84a85fb7a01aad4ea47a (commit)


- Log -----------------------------------------------------------------
commit 5d3222876e7cbd8bf87fb3b9c951cba3c9be08eb
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Feb 25 00:56:35 2016 -0500

    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: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/apps.c | 8 +++++++-
 apps/apps.h | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index 34fd391..5ad090a 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -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;
     }
 
diff --git a/apps/apps.h b/apps/apps.h
index 617c1f7..4540a63 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -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,