wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move auto Host adding to query_responder

Browse source 
Check for Host header in query_responder instead of process_responder. This
also fixes a memory leak in the old code if the headers was NULL.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-10-18 00:16:23 +01:00
parent bb7fc98c43
commit 76e0cd12f6
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/ocsp.c
View file

@ -118,7 +118,8 @@ static BIO *init_responder(const char *port);
static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
const char *port); const char *port);
static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp); static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp);
static OCSP_RESPONSE *query_responder(BIO *cbio, const char *path, static OCSP_RESPONSE *query_responder(BIO *cbio, const char *host,
const char *path,
const STACK_OF(CONF_VALUE) *headers, const STACK_OF(CONF_VALUE) *headers,
OCSP_REQUEST *req, int req_timeout); OCSP_REQUEST *req, int req_timeout);
@ -1177,13 +1178,15 @@ static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp)
return 1; return 1;
} }
static OCSP_RESPONSE *query_responder(BIO *cbio, const char *path, static OCSP_RESPONSE *query_responder(BIO *cbio, const char *host,
const char *path,
const STACK_OF(CONF_VALUE) *headers, const STACK_OF(CONF_VALUE) *headers,
OCSP_REQUEST *req, int req_timeout) OCSP_REQUEST *req, int req_timeout)
{ {
int fd; int fd;
int rv; int rv;
int i; int i;
int add_host = 1;
OCSP_REQ_CTX *ctx = NULL; OCSP_REQ_CTX *ctx = NULL;
OCSP_RESPONSE *rsp = NULL; OCSP_RESPONSE *rsp = NULL;
fd_set confds; fd_set confds;
@ -1222,10 +1225,15 @@ static OCSP_RESPONSE *query_responder(BIO *cbio, const char *path,
for (i = 0; i < sk_CONF_VALUE_num(headers); i++) { for (i = 0; i < sk_CONF_VALUE_num(headers); i++) {
CONF_VALUE *hdr = sk_CONF_VALUE_value(headers, i); CONF_VALUE *hdr = sk_CONF_VALUE_value(headers, i);
if (add_host == 1 && strcasecmp("host", hdr->name) == 0)
add_host = 0;
if (!OCSP_REQ_CTX_add1_header(ctx, hdr->name, hdr->value)) if (!OCSP_REQ_CTX_add1_header(ctx, hdr->name, hdr->value))
goto err; goto err;
} }
if (add_host == 1 && OCSP_REQ_CTX_add1_header(ctx, "Host", host) == 0)
goto err;
if (!OCSP_REQ_CTX_set1_req(ctx, req)) if (!OCSP_REQ_CTX_set1_req(ctx, req))
goto err; goto err;
@ -1272,7 +1280,6 @@ OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
BIO *cbio = NULL; BIO *cbio = NULL;
SSL_CTX *ctx = NULL; SSL_CTX *ctx = NULL;
OCSP_RESPONSE *resp = NULL; OCSP_RESPONSE *resp = NULL;
int found, i;
cbio = BIO_new_connect(host); cbio = BIO_new_connect(host);
if (!cbio) { if (!cbio) {
@ -1292,18 +1299,8 @@ OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
sbio = BIO_new_ssl(ctx, 1); sbio = BIO_new_ssl(ctx, 1);
cbio = BIO_push(sbio, cbio); 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)) resp = query_responder(cbio, host, path, headers, req, req_timeout);
BIO_printf(bio_err, "Error setting HTTP Host header\n");
resp = query_responder(cbio, path, headers, req, req_timeout);
if (!resp) if (!resp)
BIO_printf(bio_err, "Error querying OCSP responder\n"); BIO_printf(bio_err, "Error querying OCSP responder\n");
end: end: