[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  ff4a9394a2380140209a9ce2849f011063af1ecc (commit)
      from  2bfbeb264573342bea475f6dbb5b4c7fec8fdb0a (commit)


- Log -----------------------------------------------------------------
commit ff4a9394a2380140209a9ce2849f011063af1ecc
Author: bluelineXY <m.schroen at web.de>
Date:   Tue Aug 4 13:23:00 2015 +0200

    GH357: Update ocsp.c
    
    Add Host Header in OCSP query if no host header is set via -header
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Ben Laurie <ben at openssl.org>

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

Summary of changes:
 apps/ocsp.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 44f5841..5b3092a 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1262,6 +1262,8 @@ OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
     BIO *cbio = NULL;
     SSL_CTX *ctx = NULL;
     OCSP_RESPONSE *resp = NULL;
+    int found, i;
+
     cbio = BIO_new_connect(host);
     if (!cbio) {
         BIO_printf(bio_err, "Error creating connect BIO\n");
@@ -1280,6 +1282,17 @@ OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
         sbio = BIO_new_ssl(ctx, 1);
         cbio = BIO_push(sbio, cbio);
     }
+    for (found = i = 0; i < sk_CONF_VALUE_num(headers); i++) {
+       CONF_VALUE *hdr = sk_CONF_VALUE_value(headers, i);
+       if (strcasecmp("host", hdr->name) == 0) {
+           found = 1;
+           break;
+       }
+    }
+
+    if (!found && !X509V3_add_value("Host", host, &headers))
+        BIO_printf(bio_err, "Error setting HTTP Host header\n");
+
     resp = query_responder(cbio, path, headers, req, req_timeout);
     if (!resp)
         BIO_printf(bio_err, "Error querying OCSP responder\n");