generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ext_dat.h extension ordering.

Browse Source 
Reinstate -reqout code.

Avoid coredump in ocsp if setup_verify
fails.

Fix typo in ocsp usage message.
This commit is contained in:
Dr. Stephen Henson 2002-06-13 12:54:52 +00:00
parent 5cfd3419c6
commit 2e674fc611
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/ocsp.c
View File

@ -553,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, "-port num port to run responder on\n");
BIO_printf (bio_err, "-index file certificate status index file\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, "-CA file CA certificate\n");
BIO_printf (bio_err, "-rsigner file responder certificate 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 requests 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, "-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, "-resp_no_certs don't include any certificates in response\n");
BIO_printf (bio_err, "-nmin n number of minutes before next update\n"); BIO_printf (bio_err, "-nmin n number of minutes before next update\n");
@ -676,6 +676,18 @@ int MAIN(int argc, char **argv)
if (req_text && req) OCSP_REQUEST_print(out, req, 0); 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)) if (ridx_filename && (!rkey || !rsigner || !rca_cert))
{ {
BIO_printf(bio_err, "Need a responder certificate, key and CA for this operation!\n"); BIO_printf(bio_err, "Need a responder certificate, key and CA for this operation!\n");
@ -809,6 +821,8 @@ int MAIN(int argc, char **argv)
if (!store) if (!store)
store = setup_verify(bio_err, CAfile, CApath); store = setup_verify(bio_err, CAfile, CApath);
if (!store)
goto end;
if (verify_certfile) if (verify_certfile)
{ {
verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM, verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM,

4
crypto/x509v3/ext_dat.h
View File

@ -99,8 +99,8 @@ static X509V3_EXT_METHOD *standard_exts[] = {
&v3_ocsp_nocheck, &v3_ocsp_nocheck,
&v3_ocsp_acutoff, &v3_ocsp_acutoff,
&v3_ocsp_serviceloc, &v3_ocsp_serviceloc,
&v3_crl_hold, &v3_sinfo,
&v3_sinfo &v3_crl_hold
}; };
/* Number of standard extensions */ /* Number of standard extensions */