Fix typo.

[openssl.git] / apps / ocsp.c

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 9a04dd751b70f7af05b074b6ef390cbadb8d20df..723e0dc9ab9554d381f22771aabd0107cd96b5c2 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -61,6 +61,7 @@
 #include <openssl/pem.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
+#include <openssl/ssl.h>
 #include "apps.h"
 
 static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, X509 *issuer,
@@ -78,12 +79,12 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
        {
        char **args;
-       char *host = NULL, *path = "/";
+       char *host = NULL, *port = NULL, *path = "/";
        char *reqin = NULL, *respin = NULL;
        char *reqout = NULL, *respout = NULL;
        char *signfile = NULL, *keyfile = NULL;
        char *outfile = NULL;
-       int add_nonce = 1, noverify = 0;
+       int add_nonce = 1, noverify = 0, use_ssl = -1;
        OCSP_REQUEST *req = NULL;
        OCSP_RESPONSE *resp = NULL;
        OCSP_BASICRESP *bs = NULL;
@@ -95,6 +96,7 @@ int MAIN(int argc, char **argv)
        int req_text = 0, resp_text = 0;
        char *CAfile = NULL, *CApath = NULL;
        X509_STORE *store = NULL;
+       SSL_CTX *ctx = NULL;
        STACK_OF(X509) *sign_other = NULL, *verify_other = NULL;
        char *sign_certfile = NULL, *verify_certfile = NULL;
        unsigned long sign_flags = 0, verify_flags = 0;
@@ -104,7 +106,7 @@ int MAIN(int argc, char **argv)
        STACK *reqnames = NULL;
        STACK_OF(OCSP_CERTID) *ids = NULL;
        if (bio_err == NULL) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-       ERR_load_crypto_strings();
+       SSL_load_error_strings();
        args = argv + 1;
        reqnames = sk_new_null();
        ids = sk_OCSP_CERTID_new_null();
@@ -119,6 +121,19 @@ int MAIN(int argc, char **argv)
                                }
                        else badarg = 1;
                        }
+               else if (!strcmp(*args, "-url"))
+                       {
+                       if (args[1])
+                               {
+                               args++;
+                               if (!OCSP_parse_url(*args, &host, &port, &path, &use_ssl))
+                                       {
+                                       BIO_printf(bio_err, "Error parsing URL\n");
+                                       badarg = 1;
+                                       }
+                               }
+                       else badarg = 1;
+                       }
                else if (!strcmp(*args, "-host"))
                        {
                        if (args[1])
@@ -335,6 +350,7 @@ int MAIN(int argc, char **argv)
                BIO_printf (bio_err, "-respin file       read DER encoded OCSP reponse from \"file\"\n");
                BIO_printf (bio_err, "-nonce             add OCSP nonce to request\n");
                BIO_printf (bio_err, "-no_nonce          don't add OCSP nonce to request\n");
+               BIO_printf (bio_err, "-url URL           OCSP responder URL\n");
                BIO_printf (bio_err, "-host host:n       send OCSP request to host on port n\n");
                BIO_printf (bio_err, "-path              path to use in OCSP request\n");
                BIO_printf (bio_err, "-CApath dir        trusted certificates directory\n");
@@ -436,13 +452,22 @@ int MAIN(int argc, char **argv)
                        BIO_printf(bio_err, "Error creating connect BIO\n");
                        goto end;
                        }
+               if (port) BIO_set_conn_port(cbio, port);
+               if (use_ssl == 1)
+                       {
+                       BIO *sbio;
+                       ctx = SSL_CTX_new(SSLv23_client_method());
+                       SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
+                       sbio = BIO_new_ssl(ctx, 1);
+                       cbio = BIO_push(sbio, cbio);
+                       }
                if (BIO_do_connect(cbio) <= 0)
                        {
                        BIO_printf(bio_err, "Error connecting BIO\n");
                        goto end;
                        }
                resp = OCSP_sendreq_bio(cbio, path, req);
-               BIO_free(cbio);
+               BIO_free_all(cbio);
                cbio = NULL;
                if (!resp)
                        {
@@ -551,7 +576,7 @@ end:
        EVP_PKEY_free(key);
        X509_free(issuer);
        X509_free(cert);
-       BIO_free(cbio);
+       BIO_free_all(cbio);
        BIO_free(out);
        OCSP_REQUEST_free(req);
        OCSP_RESPONSE_free(resp);
@@ -561,6 +586,14 @@ end:
        sk_X509_pop_free(sign_other, X509_free);
        sk_X509_pop_free(verify_other, X509_free);
 
+       if (use_ssl != -1)
+               {
+               OPENSSL_free(host);
+               OPENSSL_free(port);
+               OPENSSL_free(path);
+               SSL_CTX_free(ctx);
+               }
+
        EXIT(ret);
 }
 
@@ -653,7 +686,7 @@ static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
                if(nextupd)
                        {
                        BIO_puts(out, "\tNext Update: ");
-                       ASN1_GENERALIZEDTIME_print(out, thisupd);
+                       ASN1_GENERALIZEDTIME_print(out, nextupd);
                        BIO_puts(out, "\n");
                        }