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);
if (!OCSP_parse_url(opt_arg(), &host, &port, &path, &use_ssl)) {
BIO_printf(bio_err, "%s Error parsing URL\n", prog);
goto end;
ERR_print_errors(bio_err);
X509_free(signer);
X509_STORE_free(store);
- if (vpm)
- X509_VERIFY_PARAM_free(vpm);
+ X509_VERIFY_PARAM_free(vpm);
EVP_PKEY_free(key);
EVP_PKEY_free(rkey);
X509_free(cert);
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? */
return NULL;
}
+
+static char *urldecode(char *p)
+{
+ unsigned char *out = (unsigned char *)p;
+ char *save = p;
+
+ for (; *p; p++) {
+ if (*p != '%')
+ *out++ = *p;
+ else if (p[1] && p[2]) {
+ *out++ = (app_hex(p[1]) << 4) | app_hex(p[2]);
+ p += 2;
+ }
+ }
+ *p = '\0';
+ return save;
+}
+
static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
const char *port)
{
int len;
OCSP_REQUEST *req = NULL;
char inbuf[2048];
- BIO *cbio = NULL;
+ char *p, *q;
+ BIO *cbio = NULL, *getbio = NULL, *b64 = NULL;
if (BIO_do_accept(acbio) <= 0) {
BIO_printf(bio_err, "Error accepting connection\n");
len = BIO_gets(cbio, inbuf, sizeof inbuf);
if (len <= 0)
return 1;
- if (strncmp(inbuf, "POST", 4) != 0) {
+ if (strncmp(inbuf, "GET", 3) == 0) {
+ /* Expecting GET {sp} /URL {sp} HTTP/1.x */
+ for (p = inbuf + 3; *p == ' ' || *p == '\t'; ++p)
+ continue;
+ if (*p) {
+ /* Move past the slash before the URL part. */
+ p++;
+ }
+ /* Splice off the HTTP version identifier. */
+ for (q = p; *q; q++)
+ if (*q == ' ' || *q == '\t')
+ break;
+ if (*q == '\0') {
+ BIO_printf(bio_err, "Invalid request\n");
+ return 1;
+ }
+ *q = '\0';
+ p = urldecode(p);
+ getbio = BIO_new_mem_buf(p, strlen(p));
+ b64 = BIO_new(BIO_f_base64());
+ 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");
return 1;
}
}
/* Try to read OCSP request */
- req = d2i_OCSP_REQUEST_bio(cbio, NULL);
+ if (getbio) {
+ req = d2i_OCSP_REQUEST_bio(getbio, NULL);
+ BIO_free_all(getbio);
+ } else
+ req = d2i_OCSP_REQUEST_bio(cbio, NULL);
if (!req) {
BIO_printf(bio_err, "Error parsing OCSP request\n");
}
err:
- if (ctx)
- OCSP_REQ_CTX_free(ctx);
+ OCSP_REQ_CTX_free(ctx);
return rsp;
}