# include <stdlib.h>
# include <string.h>
# include <time.h>
+# include <ctype.h>
# include "apps.h" /* needs to be included before the openssl
* headers! */
# include <openssl/e_os2.h>
req_timeout = atoi(opt_arg());
break;
case OPT_URL:
- if (thost)
- OPENSSL_free(thost);
- if (tport)
- OPENSSL_free(tport);
- if (tpath)
- OPENSSL_free(tpath);
+ OPENSSL_free(thost);
+ OPENSSL_free(tport);
+ OPENSSL_free(tpath);
+ thost = tport = tpath = NULL;
if (!OCSP_parse_url(opt_arg(), &host, &port, &path, &use_ssl)) {
BIO_printf(bio_err, "%s Error parsing URL\n", prog);
goto end;
if (!req && !reqin && !respin && !(port && ridx_filename))
goto opthelp;
+ if (!app_load_modules(NULL))
+ goto end;
+
out = bio_open_default(outfile, "w");
if (out == NULL)
goto end;
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 (thost)
- OPENSSL_free(thost);
- if (tport)
- OPENSSL_free(tport);
- if (tpath)
- OPENSSL_free(tpath);
+ OPENSSL_free(thost);
+ OPENSSL_free(tport);
+ OPENSSL_free(tpath);
return (ret);
}
NULL);
goto end;
}
- if (ca_id)
- OCSP_CERTID_free(ca_id);
+ OCSP_CERTID_free(ca_id);
ca_id = OCSP_cert_to_id(cert_id_md, NULL, ca);
/* Is this request about our CA? */
{
BIO *acbio = NULL, *bufbio = NULL;
- bufbio = BIO_new(BIO_f_buffer());
- if (!bufbio)
- goto err;
-# ifndef OPENSSL_NO_SOCK
- acbio = BIO_new_accept(port);
-# else
+# ifdef OPENSSL_NO_SOCK
BIO_printf(bio_err,
"Error setting up accept BIO - sockets not supported.\n");
+ return NULL;
# endif
- if (!acbio)
+ bufbio = BIO_new(BIO_f_buffer());
+ if (!bufbio)
+ goto err;
+ acbio = BIO_new(BIO_s_accept());
+ if (acbio == NULL
+ || BIO_set_bind_mode(acbio, BIO_BIND_REUSEADDR) < 0
+ || BIO_set_accept_port(acbio, port) < 0) {
+ BIO_printf(bio_err, "Error setting up accept BIO\n");
+ ERR_print_errors(bio_err);
goto err;
+ }
+
BIO_set_accept_bios(acbio, bufbio);
bufbio = NULL;
-
if (BIO_do_accept(acbio) <= 0) {
- BIO_printf(bio_err, "Error setting up accept BIO\n");
+ BIO_printf(bio_err, "Error starting accept\n");
ERR_print_errors(bio_err);
goto err;
}
}
-static char *urldecode(char *p)
+/*
+ * Decode %xx URL-decoding in-place. Ignores mal-formed sequences.
+ */
+static int urldecode(char *p)
{
unsigned char *out = (unsigned char *)p;
- char *save = p;
+ unsigned char *save = out;
for (; *p; p++) {
if (*p != '%')
*out++ = *p;
- else if (p[1] && p[2]) {
+ else if (isxdigit(p[1]) && isxdigit(p[2])) {
*out++ = (app_hex(p[1]) << 4) | app_hex(p[2]);
p += 2;
}
+ else
+ return -1;
}
- *p = '\0';
- return save;
+ *out = '\0';
+ return (int)(out - save);
}
static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
{
int len;
OCSP_REQUEST *req = NULL;
- char inbuf[2048];
+ char inbuf[2048], reqbuf[2048];
char *p, *q;
BIO *cbio = NULL, *getbio = NULL, *b64 = NULL;
*pcbio = cbio;
/* Read the request line. */
- len = BIO_gets(cbio, inbuf, sizeof inbuf);
+ len = BIO_gets(cbio, reqbuf, sizeof reqbuf);
if (len <= 0)
return 1;
- if (strncmp(inbuf, "GET", 3) == 0) {
+ if (strncmp(reqbuf, "GET ", 4) == 0) {
/* Expecting GET {sp} /URL {sp} HTTP/1.x */
- for (p = inbuf + 3; *p == ' ' || *p == '\t'; ++p)
+ for (p = reqbuf + 4; *p == ' '; ++p)
continue;
- if (*p) {
- /* Move past the slash before the URL part. */
- p++;
+ if (*p != '/') {
+ BIO_printf(bio_err, "Invalid request -- bad URL\n");
+ return 1;
}
+ p++;
+
/* Splice off the HTTP version identifier. */
for (q = p; *q; q++)
- if (*q == ' ' || *q == '\t')
+ if (*q == ' ')
break;
- if (*q == '\0') {
- BIO_printf(bio_err, "Invalid request\n");
+ if (strncmp(q, " HTTP/1.", 8) != 0) {
+ BIO_printf(bio_err, "Invalid request -- bad HTTP vesion\n");
return 1;
}
*q = '\0';
- p = urldecode(p);
- getbio = BIO_new_mem_buf(p, strlen(p));
- b64 = BIO_new(BIO_f_base64());
+ len = urldecode(p);
+ if (len <= 0) {
+ BIO_printf(bio_err, "Invalid request -- bad URL encoding\n");
+ return 1;
+ }
+ if ((getbio = BIO_new_mem_buf(p, len)) == NULL
+ || (b64 = BIO_new(BIO_f_base64())) == NULL) {
+ BIO_printf(bio_err, "Could not allocate memory\n");
+ ERR_print_errors(bio_err);
+ return 1;
+ }
BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
getbio = BIO_push(b64, getbio);
- } else if (strncmp(inbuf, "POST", 4) != 0) {
- BIO_printf(bio_err, "Invalid request\n");
+ } else if (strncmp(reqbuf, "POST ", 5) != 0) {
+ BIO_printf(bio_err, "Invalid request -- bad HTTP verb\n");
return 1;
}
+
+ /* Read and skip past the headers. */
for (;;) {
len = BIO_gets(cbio, inbuf, sizeof inbuf);
if (len <= 0)
return 1;
- /* Look for end of headers */
if ((inbuf[0] == '\r') || (inbuf[0] == '\n'))
break;
}
}
err:
- if (ctx)
- OCSP_REQ_CTX_free(ctx);
+ OCSP_REQ_CTX_free(ctx);
return rsp;
}
BIO_set_conn_port(cbio, port);
if (use_ssl == 1) {
BIO *sbio;
- ctx = SSL_CTX_new(SSLv23_client_method());
+ ctx = SSL_CTX_new(TLS_client_method());
if (ctx == NULL) {
BIO_printf(bio_err, "Error creating SSL context.\n");
goto end;
projects / openssl.git / blobdiff