[PATCH] Add OPENSSL_NO_EC2M around calls to EC_GROUP_get_curve_GF2m in ecparam.c

[Richard Clarke]

Hi tech@

When compiling ecparam with OPENSSL_NO_EC2M defined, it fails to link
as the appropriate #ifndef are not placed around the call to
EC_GROUP_get_curve_GF2m.  The included patch fixes this.

Best Regards,
Richard Clarke (@rsclarke)

Index: ecparam.c
===================================================================
RCS file: /cvs/src/usr.bin/openssl/ecparam.c,v
retrieving revision 1.17
diff -u -p -r1.17 ecparam.c
--- ecparam.c   7 Feb 2018 05:47:55 -0000       1.17
+++ ecparam.c   6 Jul 2018 06:31:12 -0000
@@ -425,11 +425,14 @@ ecparam_main(int argc, char **argv)
                        if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a,
                            ec_b, NULL))
                                goto end;
-               } else {
+               }
+#ifndef OPENSSL_NO_EC2M
+               else {
                        if (!EC_GROUP_get_curve_GF2m(group, ec_p, ec_a,
                            ec_b, NULL))
                                goto end;
                }
+#endif

                if ((point = EC_GROUP_get0_generator(group)) == NULL)
                        goto end;
@@ -492,11 +495,14 @@ ecparam_main(int argc, char **argv)
                        BIO_printf(out, "\tif ((group = EC_GROUP_new_curve_"
                            "GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)"
                            "\n\t\tgoto err;\n\n");
-               } else {
+               }
+#ifndef OPENSSL_NO_EC2M
+               else {
                        BIO_printf(out, "\tif ((group = EC_GROUP_new_curve_"
                            "GF2m(tmp_1, tmp_2, tmp_3, NULL)) == NULL)"
                            "\n\t\tgoto err;\n\n");
                }
+#endif
                BIO_printf(out, "\t/* build generator */\n");
                BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_gen_%d, "
                    "sizeof(ec_gen_%d), tmp_1)) == NULL)"