Commit 43db7aa2 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix engine key support in cms and req utilities. 



PR#4246 and PR#4266

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 7b548d3f

apps/cms.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ OPTIONS cms_options[] = { 
    {"recip", OPT_RECIP, '<', "Recipient cert file for decryption"},

    {"certsout", OPT_CERTSOUT, '>', "Certificate output file"},

    {"md", OPT_MD, 's'},

    {"inkey", OPT_INKEY, '<',

    {"inkey", OPT_INKEY, 's',

     "Input private key (if not signer or recipient)"},

    {"keyform", OPT_KEYFORM, 'f', "Input private key format (PEM or ENGINE)"},

    {"keyopt", OPT_KEYOPT, 's', "Set public key parameters as n:v pairs"},

apps/req.c

+4 −4
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ OPTIONS req_options[] = { 
    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},

    {"in", OPT_IN, '<', "Input file"},

    {"out", OPT_OUT, '>', "Output file"},

    {"key", OPT_KEY, '<', "Use the private key contained in file"},

    {"keyform", OPT_KEYFORM, 'F', "Key file format"},

    {"key", OPT_KEY, 's', "Private key to use"},

    {"keyform", OPT_KEYFORM, 'f', "Key file format"},

    {"pubkey", OPT_PUBKEY, '-', "Output public key"},

    {"new", OPT_NEW, '-', "New request"},

    {"config", OPT_CONFIG, '<', "Request template file"},
@@ -235,7 +235,7 @@ int req_main(int argc, char **argv) 
                goto opthelp;

            break;

        case OPT_ENGINE:

            (void)setup_engine(opt_arg(), 0);

            e = setup_engine(opt_arg(), 0);

            break;

        case OPT_KEYGEN_ENGINE:

#ifndef OPENSSL_NO_ENGINE
@@ -259,7 +259,7 @@ int req_main(int argc, char **argv) 
            template = opt_arg();

            break;

        case OPT_KEYFORM:

            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &keyform))

            if (!opt_format(opt_arg(), OPT_FMT_ANY, &keyform))

                goto opthelp;

            break;

        case OPT_IN: