Commit f6add6ac authored by Johannes Bauer's avatar Johannes Bauer Committed by Matt Caswell
Browse files

Make pkeyutl a bit more user-friendly 



Give meaningful error messages when the user incorrectly uses pkeyutl.

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3987)
parent 9e0d82f6

apps/pkeyutl.c

+25 −10
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ int pkeyutl_main(int argc, char **argv) 
    char hexdump = 0, asn1parse = 0, rev = 0, *prog;

    unsigned char *buf_in = NULL, *buf_out = NULL, *sig = NULL;

    OPTION_CHOICE o;

    int buf_inlen = 0, siglen = -1, keyform = FORMAT_PEM, peerform =

        FORMAT_PEM;

    int buf_inlen = 0, siglen = -1, keyform = FORMAT_PEM, peerform = FORMAT_PEM;

    int keysize = -1, pkey_op = EVP_PKEY_OP_SIGN, key_type = KEY_PRIVKEY;

    int engine_impl = 0;

    int ret = 1, rv = -1;
@@ -200,10 +199,18 @@ int pkeyutl_main(int argc, char **argv) 
        goto opthelp;



    if (kdfalg != NULL) {

        if (kdflen == 0)

        if (kdflen == 0) {

            BIO_printf(bio_err,

                       "%s: no KDF length given (-kdflen parameter).\n", prog);

            goto opthelp;

    } else if ((inkey == NULL)

            || (peerkey != NULL && pkey_op != EVP_PKEY_OP_DERIVE)) {

        }

    } else if (inkey == NULL) {

        BIO_printf(bio_err,

                   "%s: no private key given (-inkey parameter).\n", prog);

        goto opthelp;

    } else if (peerkey != NULL && pkey_op != EVP_PKEY_OP_DERIVE) {

        BIO_printf(bio_err,

                   "%s: no peer key given (-peerkey parameter).\n", prog);

        goto opthelp;

    }

    ctx = init_ctx(kdfalg, &keysize, inkey, keyform, key_type,
@@ -226,7 +233,8 @@ int pkeyutl_main(int argc, char **argv) 
            const char *opt = sk_OPENSSL_STRING_value(pkeyopts, i);



            if (pkey_ctrl_string(ctx, opt) <= 0) {

                BIO_printf(bio_err, "%s: Can't set parameter:\n", prog);

                BIO_printf(bio_err, "%s: Can't set parameter \"%s\":\n",

                           prog, opt);

                ERR_print_errors(bio_err);

                goto end;

            }
@@ -313,7 +321,11 @@ int pkeyutl_main(int argc, char **argv) 
                      buf_in, (size_t)buf_inlen);

    }

    if (rv <= 0) {

        if (pkey_op != EVP_PKEY_OP_DERIVE) {

            BIO_puts(bio_err, "Public Key operation error\n");

        } else {

            BIO_puts(bio_err, "Key derivation failed\n");

        }

        ERR_print_errors(bio_err);

        goto end;

    }
@@ -393,9 +405,12 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize, 


        if (kdfnid == NID_undef) {

            kdfnid = OBJ_ln2nid(kdfalg);

            if (kdfnid == NID_undef)

            if (kdfnid == NID_undef) {

                BIO_printf(bio_err, "The given KDF \"%s\" is unknown.\n",

                           kdfalg);

                goto end;

            }

        }

        ctx = EVP_PKEY_CTX_new_id(kdfnid, impl);

    } else {

        if (pkey == NULL)