Remove EC_FLAGS_DEFAULT_OCT.

The EC code has an amazing array of function pointer hooks, such that a
method can hook into almost any operation... and then there is the
EC_FLAGS_DEFAULT_OCT flag, which adds a bunch of complex code and #ifdef
so you can avoid setting three of those function pointers!

Remove EC_FLAGS_DEFAULT_OCT, the now unused flags field from EC_METHOD,
along with the various code that was wrapped in EC_FLAGS_DEFAULT_OCT,
setting the three function pointers that need to be set in each of the
EC_METHODs.

ok beck@ tb@

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/libcrypto/ec/ecp_smpl.c b/src/lib/libcrypto/ec/ecp_smpl.c
index df9806445c..c33347ad85 100644
--- a/src/lib/libcrypto/ec/ecp_smpl.c
+++ b/src/lib/libcrypto/ec/ecp_smpl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_smpl.c,v 1.40 2023/03/07 09:27:10 jsing Exp $ */
+/* $OpenBSD: ecp_smpl.c,v 1.41 2023/03/08 04:50:27 jsing Exp $ */
 /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * for the OpenSSL project.
  * Includes code written by Bodo Moeller for the OpenSSL project.
@@ -1654,7 +1654,6 @@ ec_GFp_simple_mul_double_nonct(const EC_GROUP *group, EC_POINT *r,
 }
 
 static const EC_METHOD ec_GFp_simple_method = {
-        .flags = EC_FLAGS_DEFAULT_OCT,
         .field_type = NID_X9_62_prime_field,
         .group_init = ec_GFp_simple_group_init,
         .group_finish = ec_GFp_simple_group_finish,
@@ -1678,6 +1677,10 @@ static const EC_METHOD ec_GFp_simple_method = {
             ec_GFp_simple_point_set_affine_coordinates,
         .point_get_affine_coordinates =
             ec_GFp_simple_point_get_affine_coordinates,
+        .point_set_compressed_coordinates =
+            ec_GFp_simple_set_compressed_coordinates,
+        .point2oct = ec_GFp_simple_point2oct,
+        .oct2point = ec_GFp_simple_oct2point,
         .add = ec_GFp_simple_add,
         .dbl = ec_GFp_simple_dbl,
         .invert = ec_GFp_simple_invert,