Commit 9cb0c3a3 authored by David Woodhouse's avatar David Woodhouse Committed by Richard Levitte
Browse files

Restore '-keyform engine' support for s_client 



This used to work in 1.0.2 but disappeared when the argument parsing was
revamped.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1639)

(cherry picked from commit a6972f34)
parent 61b1eb2c

apps/s_client.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -577,8 +577,8 @@ OPTIONS s_client_options[] = { 
    {"cert", OPT_CERT, '<', "Certificate file to use, PEM format assumed"},

    {"cert", OPT_CERT, '<', "Certificate file to use, PEM format assumed"},

    {"certform", OPT_CERTFORM, 'F',

    {"certform", OPT_CERTFORM, 'F',

     "Certificate format (PEM or DER) PEM default"},

     "Certificate format (PEM or DER) PEM default"},

    {"key", OPT_KEY, '<', "Private key file to use, if not in -cert file"},

    {"key", OPT_KEY, 's', "Private key file to use, if not in -cert file"},

    {"keyform", OPT_KEYFORM, 'F', "Key format (PEM or DER) PEM default"},

    {"keyform", OPT_KEYFORM, 'E', "Key format (PEM, DER or engine) PEM default"},

    {"pass", OPT_PASS, 's', "Private key file pass phrase source"},

    {"pass", OPT_PASS, 's', "Private key file pass phrase source"},

    {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},

    {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},

    {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},

    {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
@@ -1202,7 +1202,7 @@ int s_client_main(int argc, char **argv) 
            fallback_scsv = 1;

            fallback_scsv = 1;

            break;

            break;

        case OPT_KEYFORM:

        case OPT_KEYFORM:

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

            if (!opt_format(opt_arg(), OPT_FMT_PDE, &key_format))

                goto opthelp;

                goto opthelp;

            break;

            break;

        case OPT_PASS:

        case OPT_PASS: