Commit c6724060 authored by Rich Salz's avatar Rich Salz
Browse files

RT2206: Add -issuer flag to ocsp command 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 239f2771

apps/ocsp.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ typedef enum OPTION_choice { 
    OPT_REQIN, OPT_RESPIN, OPT_SIGNER, OPT_VAFILE, OPT_SIGN_OTHER,

    OPT_REQIN, OPT_RESPIN, OPT_SIGNER, OPT_VAFILE, OPT_SIGN_OTHER,

    OPT_VERIFY_OTHER, OPT_CAFILE, OPT_CAPATH,

    OPT_VERIFY_OTHER, OPT_CAFILE, OPT_CAPATH,

    OPT_VALIDITY_PERIOD, OPT_STATUS_AGE, OPT_SIGNKEY, OPT_REQOUT,

    OPT_VALIDITY_PERIOD, OPT_STATUS_AGE, OPT_SIGNKEY, OPT_REQOUT,

    OPT_RESPOUT, OPT_PATH, OPT_CERT, OPT_SERIAL,

    OPT_RESPOUT, OPT_PATH, OPT_ISSUER, OPT_CERT, OPT_SERIAL,

    OPT_INDEX, OPT_CA, OPT_NMIN, OPT_REQUEST, OPT_NDAYS, OPT_RSIGNER,

    OPT_INDEX, OPT_CA, OPT_NMIN, OPT_REQUEST, OPT_NDAYS, OPT_RSIGNER,

    OPT_RKEY, OPT_ROTHER, OPT_RMD, OPT_HEADER,

    OPT_RKEY, OPT_ROTHER, OPT_RMD, OPT_HEADER,

    OPT_V_ENUM,

    OPT_V_ENUM,
@@ -189,6 +189,7 @@ OPTIONS ocsp_options[] = { 
    {"reqout", OPT_REQOUT, 's', "Output file for the DER-encoded request"},

    {"reqout", OPT_REQOUT, 's', "Output file for the DER-encoded request"},

    {"respout", OPT_RESPOUT, 's', "Output file for the DER-encoded response"},

    {"respout", OPT_RESPOUT, 's', "Output file for the DER-encoded response"},

    {"path", OPT_PATH, 's', "Path to use in OCSP request"},

    {"path", OPT_PATH, 's', "Path to use in OCSP request"},

    {"issuer", OPT_ISSUER, '<', "Issuer certificate"},

    {"cert", OPT_CERT, '<', "Certificate to check"},

    {"cert", OPT_CERT, '<', "Certificate to check"},

    {"serial", OPT_SERIAL, 's', "Nerial number to check"},

    {"serial", OPT_SERIAL, 's', "Nerial number to check"},

    {"index", OPT_INDEX, '<', "Certificate status index file"},

    {"index", OPT_INDEX, '<', "Certificate status index file"},
@@ -391,6 +392,16 @@ int ocsp_main(int argc, char **argv) 
        case OPT_PATH:

        case OPT_PATH:

            path = opt_arg();

            path = opt_arg();

            break;

            break;

        case OPT_ISSUER:

            X509_free(issuer);

            issuer = load_cert(opt_arg(), FORMAT_PEM,

                               NULL, NULL, "issuer certificate");

            if (issuer == NULL)

                goto end;

            if ((issuers = sk_X509_new_null()) == NULL)

                goto end;

            sk_X509_push(issuers, issuer);

            break;

        case OPT_CERT:

        case OPT_CERT:

            X509_free(cert);

            X509_free(cert);

            cert = load_cert(opt_arg(), FORMAT_PEM,

            cert = load_cert(opt_arg(), FORMAT_PEM,
@@ -703,6 +714,11 @@ int ocsp_main(int argc, char **argv) 
        }

        }





        i = OCSP_basic_verify(bs, verify_other, store, verify_flags);

        i = OCSP_basic_verify(bs, verify_other, store, verify_flags);

        if (i <= 0 && issuers) {

            i = OCSP_basic_verify(bs, issuers, store, OCSP_TRUSTOTHER);

            if (i > 0)

                ERR_clear_error();

        }

        if (i <= 0) {

        if (i <= 0) {

            BIO_printf(bio_err, "Response Verify Failure\n");

            BIO_printf(bio_err, "Response Verify Failure\n");

            ERR_print_errors(bio_err);

            ERR_print_errors(bio_err);