BN_bn2hex() returns "0" instead of "00" for zero. This disrputs the

[openssl.git] / apps / ocsp.c

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 66460391fbfd0badd2bdb66f061e1c6c6b25d43c..17b2a659c3c24d76fe08cb056e56f99dafc62d3d 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -58,11 +58,11 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "apps.h"
 #include <openssl/pem.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
-#include "apps.h"
 
 /* Maximum leeway in validity period: default 5 minutes */
 #define MAX_VALIDITY_PERIOD    (5 * 60)
@@ -145,6 +145,9 @@ int MAIN(int argc, char **argv)
        int nmin = 0, ndays = -1;
 
        if (bio_err == NULL) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+
+       if (!load_config(bio_err, NULL))
+               goto end;
        SSL_load_error_strings();
        args = argv + 1;
        reqnames = sk_new_null();
@@ -550,8 +553,8 @@ int MAIN(int argc, char **argv)
                BIO_printf (bio_err, "-port num          port to run responder on\n");
                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 requests with\n");
-               BIO_printf (bio_err, "-rkey file         responder key to sign requests with\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");
@@ -610,11 +613,11 @@ int MAIN(int argc, char **argv)
                        NULL, e, "CA certificate");
                if (rcertfile)
                        {
-                       rother = load_certs(bio_err, sign_certfile, FORMAT_PEM,
+                       rother = load_certs(bio_err, rcertfile, FORMAT_PEM,
                                NULL, e, "responder other certificates");
-                       if (!sign_other) goto end;
+                       if (!rother) goto end;
                        }
-               rkey = load_key(bio_err, rkeyfile, FORMAT_PEM, NULL, NULL,
+               rkey = load_key(bio_err, rkeyfile, FORMAT_PEM, 0, NULL, NULL,
                        "responder private key");
                if (!rkey)
                        goto end;
@@ -660,7 +663,7 @@ int MAIN(int argc, char **argv)
                                NULL, e, "signer certificates");
                        if (!sign_other) goto end;
                        }
-               key = load_key(bio_err, keyfile, FORMAT_PEM, NULL, NULL,
+               key = load_key(bio_err, keyfile, FORMAT_PEM, 0, NULL, NULL,
                        "signer private key");
                if (!key)
                        goto end;
@@ -673,6 +676,18 @@ int MAIN(int argc, char **argv)
 
        if (req_text && req) OCSP_REQUEST_print(out, req, 0);
 
+       if (reqout)
+               {
+               derbio = BIO_new_file(reqout, "wb");
+               if(!derbio)
+                       {
+                       BIO_printf(bio_err, "Error opening file %s\n", reqout);
+                       goto end;
+                       }
+               i2d_OCSP_REQUEST_bio(derbio, req);
+               BIO_free(derbio);
+               }
+
        if (ridx_filename && (!rkey || !rsigner || !rca_cert))
                {
                BIO_printf(bio_err, "Need a responder certificate, key and CA for this operation!\n");
@@ -806,6 +821,8 @@ int MAIN(int argc, char **argv)
 
        if (!store)
                store = setup_verify(bio_err, CAfile, CApath);
+       if (!store)
+               goto end;
        if (verify_certfile)
                {
                verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM,
@@ -1103,7 +1120,10 @@ static char **lookup_serial(TXT_DB *db, ASN1_INTEGER *ser)
        char *itmp, *row[DB_NUMBER],**rrow;
        for (i = 0; i < DB_NUMBER; i++) row[i] = NULL;
        bn = ASN1_INTEGER_to_BN(ser,NULL);
-       itmp = BN_bn2hex(bn);
+       if (BN_is_zero(bn))
+               itmp = BUF_strdup("00");
+       else
+               itmp = BN_bn2hex(bn);
        row[DB_serial] = itmp;
        BN_free(bn);
        rrow=TXT_DB_get_by_index(db,DB_serial,row);