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

Fix engine key support in utilities. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 2f0c9d5c

apps/ca.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ OPTIONS ca_options[] = { 
    {"days", OPT_DAYS, 'p', "Number of days to certify the cert for"},

    {"md", OPT_MD, 's', "md to use; one of md2, md5, sha or sha1"},

    {"policy", OPT_POLICY, 's', "The CA 'policy' to support"},

    {"keyfile", OPT_KEYFILE, '<', "Private key file"},

    {"keyfile", OPT_KEYFILE, 's', "Private key"},

    {"keyform", OPT_KEYFORM, 'f', "Private key file format (PEM or ENGINE)"},

    {"passin", OPT_PASSIN, 's'},

    {"key", OPT_KEY, 's', "Key to decode the private key if it is encrypted"},

apps/dgst.c

+5 −5
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ OPTIONS dgst_options[] = { 
     "Use file(s) containing random data to seed RNG or an EGD sock"},

    {"out", OPT_OUT, '>', "Output to filename rather than stdout"},

    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},

    {"sign", OPT_SIGN, '<', "Sign digest using private key in file"},

    {"verify", OPT_VERIFY, '<',

     "Verify a signature using public key in file"},

    {"prverify", OPT_PRVERIFY, '<',

     "Verify a signature using private key in file"},

    {"sign", OPT_SIGN, 's', "Sign digest using private key"},

    {"verify", OPT_VERIFY, 's',

     "Verify a signature using public key"},

    {"prverify", OPT_PRVERIFY, 's',

     "Verify a signature using private key"},

    {"signature", OPT_SIGNATURE, '<', "File with signature to verify"},

    {"keyform", OPT_KEYFORM, 'f', "Key file format (PEM or ENGINE)"},

    {"hex", OPT_HEX, '-', "Print as hex dump"},

apps/dsa.c

+2 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ OPTIONS dsa_options[] = { 
    {"help", OPT_HELP, '-', "Display this summary"},

    {"inform", OPT_INFORM, 'F', "Input format, DER PEM PVK"},

    {"outform", OPT_OUTFORM, 'F', "Output format, DER PEM PVK"},

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

    {"in", OPT_IN, 's', "Input key"},

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

    {"noout", OPT_NOOUT, '-', "Don't print key out"},

    {"text", OPT_TEXT, '-', "Print the key in text"},
@@ -130,8 +130,7 @@ int dsa_main(int argc, char **argv) 
            ret = 0;

            goto end;

        case OPT_INFORM:

            if (!opt_format

                (opt_arg(), OPT_FMT_PEMDER | OPT_FMT_PVK, &informat))

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

                goto opthelp;

            break;

        case OPT_IN:

apps/pkey.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ OPTIONS pkey_options[] = { 
    {"outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)"},

    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},

    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},

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

    {"in", OPT_IN, 's', "Input key"},

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

    {"pubin", OPT_PUBIN, '-',

     "Read public key from input (default is private key)"},
@@ -116,7 +116,7 @@ int pkey_main(int argc, char **argv) 
            ret = 0;

            goto end;

        case OPT_INFORM:

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

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

                goto opthelp;

            break;

        case OPT_OUTFORM:

apps/rsa.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ OPTIONS rsa_options[] = { 
    {"help", OPT_HELP, '-', "Display this summary"},

    {"inform", OPT_INFORM, 'f', "Input format, one of DER NET PEM"},

    {"outform", OPT_OUTFORM, 'f', "Output format, one of DER NET PEM PVK"},

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

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

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

    {"pubin", OPT_PUBIN, '-', "Expect a public key in input file"},

    {"pubout", OPT_PUBOUT, '-', "Output a public key"},