X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fec%2Fecp_recp.c;h=fec843b5c85b7aafb6b94d93456320f91ef5245f;hb=7ae551fd03b447e41d3a74e803a711350383ebc4;hp=8afdca1fa7fabe7cc540a434256bbef6e6d92eaf;hpb=1d5bd6cf71b1e4aedda0264905a9ddc64d8c1d76;p=oweals%2Fopenssl.git

diff --git a/crypto/ec/ecp_recp.c b/crypto/ec/ecp_recp.c
index 8afdca1fa7..fec843b5c8 100644
--- a/crypto/ec/ecp_recp.c
+++ b/crypto/ec/ecp_recp.c
@@ -55,17 +55,20 @@
 
 #include "ec_lcl.h"
 
-
+#if 0
 const EC_METHOD *EC_GFp_recp_method(void)
 	{
 	static const EC_METHOD ret = {
 		ec_GFp_recp_group_init,
-		ec_GFp_recp_group_set_curve_GFp,
 		ec_GFp_recp_group_finish,
 		ec_GFp_recp_group_clear_finish,
 		ec_GFp_recp_group_copy,
+		ec_GFp_recp_group_set_curve_GFp,
+		ec_GFp_simple_group_get_curve_GFp,
 		ec_GFp_simple_group_set_generator,
-		/* TODO: 'set' and 'get' functions for EC_GROUPs */
+		ec_GFp_simple_group_get0_generator,
+		ec_GFp_simple_group_get_order,
+		ec_GFp_simple_group_get_cofactor,
 		ec_GFp_simple_point_init,
 		ec_GFp_simple_point_finish,
 		ec_GFp_simple_point_clear_finish,
@@ -85,21 +88,23 @@ const EC_METHOD *EC_GFp_recp_method(void)
 		ec_GFp_simple_is_on_curve,
 		ec_GFp_simple_cmp,
 		ec_GFp_simple_make_affine,
+		ec_GFp_simple_points_make_affine,
 		ec_GFp_recp_field_mul,
 		ec_GFp_recp_field_sqr,
-		ec_GFp_recp_field_encode,
-		ec_GFp_recp_field_decode };
+		0 /* field_encode */,
+		0 /* field_decode */,
+		0 /* field_set_to_one */ };
 
 	return &ret;
 	}
-
+#endif
 
 int ec_GFp_recp_group_init(EC_GROUP *group)
 	{
 	int ok;
 
 	ok = ec_GFp_simple_group_init(group);
-	group->field_data = NULL;
+	group->field_data1 = NULL;
 	return ok;
 	}
 
@@ -126,11 +131,3 @@ int ec_GFp_recp_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, con
 
 int ec_GFp_recp_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
 /* TODO */
-
-
-int ec_GFp_recp_field_encode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/* TODO */
-
-
-int ec_GFp_recp_field_decode(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/* TODO */