Commit d591f300 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix ecparam -genkey with point compression or DER outform



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

(cherry picked from commit 4bdc25b0)
parent 42b291f3
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -546,6 +546,9 @@ int MAIN(int argc, char **argv)
        BIO_printf(out, "\treturn(group);\n\t}\n");
    }

    if (outformat == FORMAT_ASN1 && genkey)
        noout = 1;

    if (!noout) {
        if (outformat == FORMAT_ASN1)
            i = i2d_ECPKParameters_bio(out, group);
@@ -582,6 +585,9 @@ int MAIN(int argc, char **argv)
        if (EC_KEY_set_group(eckey, group) == 0)
            goto end;

        if (new_form)
            EC_KEY_set_conv_form(eckey, form);

        if (!EC_KEY_generate_key(eckey)) {
            EC_KEY_free(eckey);
            goto end;