Upgrade chrome's OpenSSL to same version Android ships with.

openssl/apps/ocsp.c

 /* ocsp.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 38 matching lines @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ====================================================================
  *
  * This product includes cryptographic software written by Eric Young
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com).
  *
  */
 #ifndef OPENSSL_NO_OCSP
+
+#ifdef OPENSSL_SYS_VMS
+#define _XOPEN_SOURCE_EXTENDED  /* So fd_set and friends get properly defined
+                                   on OpenVMS */
+#endif
+
 #define USE_SOCKETS
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include "apps.h" /* needs to be included before the openssl headers! */
 #include <openssl/e_os2.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
 #include <openssl/ssl.h>
-#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#include <openssl/x509v3.h>
 
+#if defined(NETWARE_CLIB)
+#  ifdef NETWARE_BSDSOCK
+#    include <sys/socket.h>
+#    include <sys/bsdskt.h>
+#  else
+#    include <novsock2.h>
+#  endif
+#elif defined(NETWARE_LIBC)
+#  ifdef NETWARE_BSDSOCK
+#    include <sys/select.h>
+#  else
+#    include <novsock2.h>
+#  endif
+#endif
+  
 /* Maximum leeway in validity period: default 5 minutes */
 #define MAX_VALIDITY_PERIOD     (5 * 60)
 
-static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, X509 *issuer,
+static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, const EVP_MD *cert_id_md, X509 *issuer,
                                 STACK_OF(OCSP_CERTID) *ids);
-static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, X509 *issuer,
+static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, const EVP_MD * cert_id_md, X509 *issuer,
                                 STACK_OF(OCSP_CERTID) *ids);
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-                                STACK *names, STACK_OF(OCSP_CERTID) *ids,
-                                long nsec, long maxage);
+                              STACK_OF(OPENSSL_STRING) *names,
+                              STACK_OF(OCSP_CERTID) *ids, long nsec,
+                              long maxage);
 
 static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db,
                         X509 *ca, X509 *rcert, EVP_PKEY *rkey,
                         STACK_OF(X509) *rother, unsigned long flags,
                         int nmin, int ndays);
 
 static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser);
 static BIO *init_responder(char *port);
 static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, char *port);
 static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp);
 static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path,
+                                STACK_OF(CONF_VALUE) *headers,
                                 OCSP_REQUEST *req, int req_timeout);
 
 #undef PROG
 #define PROG ocsp_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
         ENGINE *e = NULL;
         char **args;
         char *host = NULL, *port = NULL, *path = "/";
         char *reqin = NULL, *respin = NULL;
         char *reqout = NULL, *respout = NULL;
         char *signfile = NULL, *keyfile = NULL;
         char *rsignfile = NULL, *rkeyfile = NULL;
         char *outfile = NULL;
         int add_nonce = 1, noverify = 0, use_ssl = -1;
+        STACK_OF(CONF_VALUE) *headers = NULL;
         OCSP_REQUEST *req = NULL;
         OCSP_RESPONSE *resp = NULL;
         OCSP_BASICRESP *bs = NULL;
         X509 *issuer = NULL, *cert = NULL;
         X509 *signer = NULL, *rsigner = NULL;
         EVP_PKEY *key = NULL, *rkey = NULL;
         BIO *acbio = NULL, *cbio = NULL;
         BIO *derbio = NULL;
         BIO *out = NULL;
         int req_timeout = -1;
         int req_text = 0, resp_text = 0;
         long nsec = MAX_VALIDITY_PERIOD, maxage = -1;
         char *CAfile = NULL, *CApath = NULL;
         X509_STORE *store = NULL;
         STACK_OF(X509) *sign_other = NULL, *verify_other = NULL, *rother = NULL;
         char *sign_certfile = NULL, *verify_certfile = NULL, *rcertfile = NULL;
         unsigned long sign_flags = 0, verify_flags = 0, rflags = 0;
         int ret = 1;
         int accept_count = -1;
         int badarg = 0;
         int i;
         int ignore_err = 0;
-        STACK *reqnames = NULL;
+        STACK_OF(OPENSSL_STRING) *reqnames = NULL;
         STACK_OF(OCSP_CERTID) *ids = NULL;
 
         X509 *rca_cert = NULL;
         char *ridx_filename = NULL;
         char *rca_filename = NULL;
         CA_DB *rdb = NULL;
         int nmin = 0, ndays = -1;
+        const EVP_MD *cert_id_md = NULL;
 
         if (bio_err == NULL) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
         if (!load_config(bio_err, NULL))
                 goto end;
         SSL_load_error_strings();
         OpenSSL_add_ssl_algorithms();
         args = argv + 1;
-        reqnames = sk_new_null();
+        reqnames = sk_OPENSSL_STRING_new_null();
         ids = sk_OCSP_CERTID_new_null();
         while (!badarg && *args && *args[0] == '-')
                 {
                 if (!strcmp(*args, "-out"))
                         {
                         if (args[1])
                                 {
                                 args++;
                                 outfile = *args;
                                 }
@@ skipping 39 matching lines @@
                         }
                 else if (!strcmp(*args, "-port"))
                         {
                         if (args[1])
                                 {
                                 args++;
                                 port = *args;
                                 }
                         else badarg = 1;
                         }
+                else if (!strcmp(*args, "-header"))
+                        {
+                        if (args[1] && args[2])
+                                {
+                                if (!X509V3_add_value(args[1], args[2], &headers))
+                                        goto end;
+                                args += 2;
+                                }
+                        else badarg = 1;
+                        }
                 else if (!strcmp(*args, "-ignore_err"))
                         ignore_err = 1;
                 else if (!strcmp(*args, "-noverify"))
                         noverify = 1;
                 else if (!strcmp(*args, "-nonce"))
                         add_nonce = 2;
                 else if (!strcmp(*args, "-no_nonce"))
                         add_nonce = 0;
                 else if (!strcmp(*args, "-resp_no_certs"))
                         rflags |= OCSP_NOCERTS;
@@ skipping 179 matching lines @@
                         }
                 else if (!strcmp (*args, "-cert"))
                         {
                         if (args[1])
                                 {
                                 args++;
                                 X509_free(cert);
                                 cert = load_cert(bio_err, *args, FORMAT_PEM,
                                         NULL, e, "certificate");
                                 if(!cert) goto end;
-                                if(!add_ocsp_cert(&req, cert, issuer, ids))
+                                if (!cert_id_md) cert_id_md = EVP_sha1();
+                                if(!add_ocsp_cert(&req, cert, cert_id_md, issuer, ids))
                                         goto end;
-                                if(!sk_push(reqnames, *args))
+                                if(!sk_OPENSSL_STRING_push(reqnames, *args))
                                         goto end;
                                 }
                         else badarg = 1;
                         }
                 else if (!strcmp(*args, "-serial"))
                         {
                         if (args[1])
                                 {
                                 args++;
-                                if(!add_ocsp_serial(&req, *args, issuer, ids))
+                                if (!cert_id_md) cert_id_md = EVP_sha1();
+                                if(!add_ocsp_serial(&req, *args, cert_id_md, issuer, ids))
                                         goto end;
-                                if(!sk_push(reqnames, *args))
+                                if(!sk_OPENSSL_STRING_push(reqnames, *args))
                                         goto end;
                                 }
                         else badarg = 1;
                         }
                 else if (!strcmp(*args, "-index"))
                         {
                         if (args[1])
                                 {
                                 args++;
                                 ridx_filename = *args;
@@ skipping 79 matching lines @@
                         }
                 else if (!strcmp(*args, "-rother"))
                         {
                         if (args[1])
                                 {
                                 args++;
                                 rcertfile = *args;
                                 }
                         else badarg = 1;
                         }
-                else badarg = 1;
+                else if ((cert_id_md = EVP_get_digestbyname((*args)+1))==NULL)
+                        {
+                        badarg = 1;
+                        }
                 args++;
                 }
 
         /* Have we anything to do? */
         if (!req && !reqin && !respin && !(port && ridx_filename)) badarg = 1;
 
         if (badarg)
                 {
                 BIO_printf (bio_err, "OCSP utility\n");
                 BIO_printf (bio_err, "Usage ocsp [options]\n");
@@ skipping 35 matching lines @@
                 BIO_printf (bio_err, "-index file        certificate status index file\n");
                 BIO_printf (bio_err, "-CA file           CA certificate\n");
                 BIO_printf (bio_err, "-rsigner file      responder certificate to sign responses with\n");
                 BIO_printf (bio_err, "-rkey file         responder key to sign responses with\n");
                 BIO_printf (bio_err, "-rother file       other certificates to include in response\n");
                 BIO_printf (bio_err, "-resp_no_certs     don't include any certificates in response\n");
                 BIO_printf (bio_err, "-nmin n            number of minutes before next update\n");
                 BIO_printf (bio_err, "-ndays n           number of days before next update\n");
                 BIO_printf (bio_err, "-resp_key_id       identify reponse by signing certificate key ID\n");
                 BIO_printf (bio_err, "-nrequest n        number of requests to accept (default unlimited)\n");
+                BIO_printf (bio_err, "-<dgst alg>     use specified digest in the request");
                 goto end;
                 }
 
         if(outfile) out = BIO_new_file(outfile, "w");
         else out = BIO_new_fp(stdout, BIO_NOCLOSE);
 
         if(!out)
                 {
                 BIO_printf(bio_err, "Error opening output file\n");
                 goto end;
@@ skipping 86 matching lines @@
                 if (sign_certfile)
                         {
                         sign_other = load_certs(bio_err, sign_certfile, FORMAT_PEM,
                                 NULL, e, "signer certificates");
                         if (!sign_other) goto end;
                         }
                 key = load_key(bio_err, keyfile, FORMAT_PEM, 0, NULL, NULL,
                         "signer private key");
                 if (!key)
                         goto end;
-                if (!OCSP_request_sign(req, signer, key, EVP_sha1(), sign_other, sign_flags))
+
+                if (!OCSP_request_sign(req, signer, key, NULL, sign_other, sign_flags))
                         {
                         BIO_printf(bio_err, "Error signing OCSP request\n");
                         goto end;
                         }
                 }
 
         if (req_text && req) OCSP_REQUEST_print(out, req, 0);
 
         if (reqout)
                 {
@@ skipping 23 matching lines @@
         if (rdb)
                 {
                 i = make_ocsp_response(&resp, req, rdb, rca_cert, rsigner, rkey, rother, rflags, nmin, ndays);
                 if (cbio)
                         send_ocsp_response(cbio, resp);
                 }
         else if (host)
                 {
 #ifndef OPENSSL_NO_SOCK
                 resp = process_responder(bio_err, req, host, path,
-                                                port, use_ssl, req_timeout);
+                                        port, use_ssl, headers, req_timeout);
                 if (!resp)
                         goto end;
 #else
                 BIO_printf(bio_err, "Error creating connect BIO - sockets not supported.\n");
                 goto end;
 #endif
                 }
         else if (respin)
                 {
                 derbio = BIO_new_file(respin, "rb");
@@ skipping 124 matching lines @@
         X509_free(cert);
         X509_free(rsigner);
         X509_free(rca_cert);
         free_index(rdb);
         BIO_free_all(cbio);
         BIO_free_all(acbio);
         BIO_free(out);
         OCSP_REQUEST_free(req);
         OCSP_RESPONSE_free(resp);
         OCSP_BASICRESP_free(bs);
-        sk_free(reqnames);
+        sk_OPENSSL_STRING_free(reqnames);
         sk_OCSP_CERTID_free(ids);
         sk_X509_pop_free(sign_other, X509_free);
         sk_X509_pop_free(verify_other, X509_free);
+        sk_CONF_VALUE_pop_free(headers, X509V3_conf_free);
 
         if (use_ssl != -1)
                 {
                 OPENSSL_free(host);
                 OPENSSL_free(port);
                 OPENSSL_free(path);
                 }
 
         OPENSSL_EXIT(ret);
 }
 
-static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, X509 *issuer,
+static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, const EVP_MD *cert_id_md,X509 *issuer,
                                 STACK_OF(OCSP_CERTID) *ids)
         {
         OCSP_CERTID *id;
         if(!issuer)
                 {
                 BIO_printf(bio_err, "No issuer certificate specified\n");
                 return 0;
                 }
         if(!*req) *req = OCSP_REQUEST_new();
         if(!*req) goto err;
-        id = OCSP_cert_to_id(NULL, cert, issuer);
+        id = OCSP_cert_to_id(cert_id_md, cert, issuer);
         if(!id || !sk_OCSP_CERTID_push(ids, id)) goto err;
         if(!OCSP_request_add0_id(*req, id)) goto err;
         return 1;
 
         err:
         BIO_printf(bio_err, "Error Creating OCSP request\n");
         return 0;
         }
 
-static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, X509 *issuer,
+static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,const EVP_MD *cert_id_md, X509 *issuer,
                                 STACK_OF(OCSP_CERTID) *ids)
         {
         OCSP_CERTID *id;
         X509_NAME *iname;
         ASN1_BIT_STRING *ikey;
         ASN1_INTEGER *sno;
         if(!issuer)
                 {
                 BIO_printf(bio_err, "No issuer certificate specified\n");
                 return 0;
                 }
         if(!*req) *req = OCSP_REQUEST_new();
         if(!*req) goto err;
         iname = X509_get_subject_name(issuer);
         ikey = X509_get0_pubkey_bitstr(issuer);
         sno = s2i_ASN1_INTEGER(NULL, serial);
         if(!sno)
                 {
                 BIO_printf(bio_err, "Error converting serial number %s\n", serial);
                 return 0;
                 }
-        id = OCSP_cert_id_new(EVP_sha1(), iname, ikey, sno);
+        id = OCSP_cert_id_new(cert_id_md, iname, ikey, sno);
         ASN1_INTEGER_free(sno);
         if(!id || !sk_OCSP_CERTID_push(ids, id)) goto err;
         if(!OCSP_request_add0_id(*req, id)) goto err;
         return 1;
 
         err:
         BIO_printf(bio_err, "Error Creating OCSP request\n");
         return 0;
         }
 
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-                                        STACK *names, STACK_OF(OCSP_CERTID) *ids,
-                                        long nsec, long maxage)
+                              STACK_OF(OPENSSL_STRING) *names,
+                              STACK_OF(OCSP_CERTID) *ids, long nsec,
+                              long maxage)
         {
         OCSP_CERTID *id;
         char *name;
         int i;
 
         int status, reason;
 
         ASN1_GENERALIZEDTIME *rev, *thisupd, *nextupd;
 
-        if (!bs || !req || !sk_num(names) || !sk_OCSP_CERTID_num(ids))
+        if (!bs || !req || !sk_OPENSSL_STRING_num(names) || !sk_OCSP_CERTID_num(ids))
                 return 1;
 
         for (i = 0; i < sk_OCSP_CERTID_num(ids); i++)
                 {
                 id = sk_OCSP_CERTID_value(ids, i);
-                name = sk_value(names, i);
+                name = sk_OPENSSL_STRING_value(names, i);
                 BIO_printf(out, "%s: ", name);
 
                 if(!OCSP_resp_find_status(bs, id, &status, &reason,
                                         &rev, &thisupd, &nextupd))
                         {
                         BIO_puts(out, "ERROR: No Status found.\n");
                         continue;
                         }
 
                 /* Check validity: if invalid write to output BIO so we
@@ skipping 36 matching lines @@
 static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db,
                         X509 *ca, X509 *rcert, EVP_PKEY *rkey,
                         STACK_OF(X509) *rother, unsigned long flags,
                         int nmin, int ndays)
         {
         ASN1_TIME *thisupd = NULL, *nextupd = NULL;
         OCSP_CERTID *cid, *ca_id = NULL;
         OCSP_BASICRESP *bs = NULL;
         int i, id_count, ret = 1;
 
-
         id_count = OCSP_request_onereq_count(req);
 
         if (id_count <= 0)
                 {
                 *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, NULL);
                 goto end;
                 }
 
-        ca_id = OCSP_cert_to_id(EVP_sha1(), NULL, ca);
 
         bs = OCSP_BASICRESP_new();
         thisupd = X509_gmtime_adj(NULL, 0);
         if (ndays != -1)
                 nextupd = X509_gmtime_adj(NULL, nmin * 60 + ndays * 3600 * 24 );
 
         /* Examine each certificate id in the request */
         for (i = 0; i < id_count; i++)
                 {
                 OCSP_ONEREQ *one;
                 ASN1_INTEGER *serial;
                 char **inf;
+                ASN1_OBJECT *cert_id_md_oid;
+                const EVP_MD *cert_id_md;
                 one = OCSP_request_onereq_get0(req, i);
                 cid = OCSP_onereq_get0_id(one);
+
+                OCSP_id_get0_info(NULL,&cert_id_md_oid, NULL,NULL, cid);
+
+                cert_id_md = EVP_get_digestbyobj(cert_id_md_oid);       
+                if (! cert_id_md) 
+                        {
+                        *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
+                                NULL);
+                                goto end;
+                        }       
+                if (ca_id) OCSP_CERTID_free(ca_id);
+                ca_id = OCSP_cert_to_id(cert_id_md, NULL, ca);
+
                 /* Is this request about our CA? */
                 if (OCSP_id_issuer_cmp(ca_id, cid))
                         {
                         OCSP_basic_add1_status(bs, cid,
                                                 V_OCSP_CERTSTATUS_UNKNOWN,
                                                 0, NULL,
                                                 thisupd, nextupd);
                         continue;
                         }
                 OCSP_id_get0_info(NULL, NULL, NULL, &serial, cid);
@@ skipping 24 matching lines @@
                                 OCSP_SINGLERESP_add1_ext_i2d(single, NID_invalidity_date, invtm, 0, 0);
                         else if (inst)
                                 OCSP_SINGLERESP_add1_ext_i2d(single, NID_hold_instruction_code, inst, 0, 0);
                         ASN1_OBJECT_free(inst);
                         ASN1_TIME_free(revtm);
                         ASN1_GENERALIZEDTIME_free(invtm);
                         }
                 }
 
         OCSP_copy_nonce(bs, req);
-                
-        OCSP_basic_sign(bs, rcert, rkey, EVP_sha1(), rother, flags);
+        
+        OCSP_basic_sign(bs, rcert, rkey, NULL, rother, flags);
 
         *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_SUCCESSFUL, bs);
 
         end:
         ASN1_TIME_free(thisupd);
         ASN1_TIME_free(nextupd);
         OCSP_CERTID_free(ca_id);
         OCSP_BASICRESP_free(bs);
         return ret;
 
@@ skipping 111 matching lines @@
                 "Content-Length: %d\r\n\r\n";
         if (!cbio)
                 return 0;
         BIO_printf(cbio, http_resp, i2d_OCSP_RESPONSE(resp, NULL));
         i2d_OCSP_RESPONSE_bio(cbio, resp);
         (void)BIO_flush(cbio);
         return 1;
         }
 
 static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path,
+                                STACK_OF(CONF_VALUE) *headers,
                                 OCSP_REQUEST *req, int req_timeout)
         {
         int fd;
         int rv;
+        int i;
         OCSP_REQ_CTX *ctx = NULL;
         OCSP_RESPONSE *rsp = NULL;
         fd_set confds;
         struct timeval tv;
 
         if (req_timeout != -1)
                 BIO_set_nbio(cbio, 1);
 
         rv = BIO_do_connect(cbio);
 
         if ((rv <= 0) && ((req_timeout == -1) || !BIO_should_retry(cbio)))
                 {
                 BIO_puts(err, "Error connecting BIO\n");
                 return NULL;
                 }
 
-        if (req_timeout == -1)
-                return OCSP_sendreq_bio(cbio, path, req);
-
         if (BIO_get_fd(cbio, &fd) <= 0)
                 {
                 BIO_puts(err, "Can't get connection fd\n");
                 goto err;
                 }
 
-        if (rv <= 0)
+        if (req_timeout != -1 && rv <= 0)
                 {
                 FD_ZERO(&confds);
                 openssl_fdset(fd, &confds);
                 tv.tv_usec = 0;
                 tv.tv_sec = req_timeout;
                 rv = select(fd + 1, NULL, (void *)&confds, NULL, &tv);
                 if (rv == 0)
                         {
                         BIO_puts(err, "Timeout on connect\n");
                         return NULL;
                         }
                 }
 
 
-        ctx = OCSP_sendreq_new(cbio, path, req, -1);
+        ctx = OCSP_sendreq_new(cbio, path, NULL, -1);
         if (!ctx)
                 return NULL;
+
+        for (i = 0; i < sk_CONF_VALUE_num(headers); i++)
+                {
+                CONF_VALUE *hdr = sk_CONF_VALUE_value(headers, i);
+                if (!OCSP_REQ_CTX_add1_header(ctx, hdr->name, hdr->value))
+                        goto err;
+                }
+
+        if (!OCSP_REQ_CTX_set1_req(ctx, req))
+                goto err;
         
         for (;;)
                 {
                 rv = OCSP_sendreq_nbio(&rsp, ctx);
                 if (rv != -1)
                         break;
+                if (req_timeout == -1)
+                        continue;
                 FD_ZERO(&confds);
                 openssl_fdset(fd, &confds);
                 tv.tv_usec = 0;
                 tv.tv_sec = req_timeout;
                 if (BIO_should_read(cbio))
                         rv = select(fd + 1, (void *)&confds, NULL, NULL, &tv);
                 else if (BIO_should_write(cbio))
                         rv = select(fd + 1, NULL, (void *)&confds, NULL, &tv);
                 else
                         {
                         BIO_puts(err, "Unexpected retry condition\n");
                         goto err;
                         }
                 if (rv == 0)
                         {
                         BIO_puts(err, "Timeout on request\n");
                         break;
                         }
                 if (rv == -1)
                         {
                         BIO_puts(err, "Select error\n");
                         break;
                         }
-                        
+
                 }
         err:
         if (ctx)
                 OCSP_REQ_CTX_free(ctx);
 
         return rsp;
         }
 
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
                         char *host, char *path, char *port, int use_ssl,
+                        STACK_OF(CONF_VALUE) *headers,
                         int req_timeout)
         {
         BIO *cbio = NULL;
         SSL_CTX *ctx = NULL;
         OCSP_RESPONSE *resp = NULL;
         cbio = BIO_new_connect(host);
         if (!cbio)
                 {
                 BIO_printf(err, "Error creating connect BIO\n");
                 goto end;
@@ skipping 14 matching lines @@
 #endif
                 if (ctx == NULL)
                         {
                         BIO_printf(err, "Error creating SSL context.\n");
                         goto end;
                         }
                 SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
                 sbio = BIO_new_ssl(ctx, 1);
                 cbio = BIO_push(sbio, cbio);
                 }
-        resp = query_responder(err, cbio, path, req, req_timeout);
+        resp = query_responder(err, cbio, path, headers, req, req_timeout);
         if (!resp)
                 BIO_printf(bio_err, "Error querying OCSP responsder\n");
         end:
+        if (cbio)
+                BIO_free_all(cbio);
         if (ctx)
                 SSL_CTX_free(ctx);
-        if (cbio)
-                BIO_free_all(cbio);
         return resp;
         }
 
 #endif