Update - OpenSSL 1.1.1-pre7-dev

2018-05-23 23:52:41 +09:00
parent e8a0afd4a0
commit ef253190c7
624 changed files with 189420 additions and 8064 deletions
@@ -384,6 +384,9 @@ int ecparam_main(int argc, char **argv)
                        "}\n");
    }

+    if (outformat == FORMAT_ASN1 && genkey)
+        noout = 1;
+
    if (!noout) {
        if (outformat == FORMAT_ASN1)
            i = i2d_ECPKParameters_bio(out, group);
@@ -410,6 +413,9 @@ int ecparam_main(int argc, char **argv)
            goto end;
        }

+        if (new_form)
+            EC_KEY_set_conv_form(eckey, form);
+
        if (!EC_KEY_generate_key(eckey)) {
            BIO_printf(bio_err, "unable to generate key\n");
            EC_KEY_free(eckey);