Comments out some unimplemented functions instead of redeclaring them.

[openssl.git] / crypto / ec / ecp_recp.c

diff --git a/crypto/ec/ecp_recp.c b/crypto/ec/ecp_recp.c
index 2419a3058e9203cffa682135dae6129053653009..d454c12fd3b8c6805608cee6b719851c1efc8385 100644 (file)
--- a/crypto/ec/ecp_recp.c
+++ b/crypto/ec/ecp_recp.c
@@ -52,10 +52,15 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * Portions of this software developed by SUN MICROSYSTEMS, INC.,
+ * and contributed to the OpenSSL project.
+ */
 
 #include "ec_lcl.h"
 
-
+#if 0
 const EC_METHOD *EC_GFp_recp_method(void)
        {
        static const EC_METHOD ret = {
@@ -63,12 +68,14 @@ const EC_METHOD *EC_GFp_recp_method(void)
                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_recp_group_set_curve,
+               ec_GFp_simple_group_get_curve,
+               ec_GFp_simple_group_get_degree,
                ec_GFp_simple_group_set_generator,
                ec_GFp_simple_group_get0_generator,
                ec_GFp_simple_group_get_order,
                ec_GFp_simple_group_get_cofactor,
+               ec_GFp_simple_group_check_discriminant,
                ec_GFp_simple_point_init,
                ec_GFp_simple_point_finish,
                ec_GFp_simple_point_clear_finish,
@@ -76,9 +83,9 @@ const EC_METHOD *EC_GFp_recp_method(void)
                ec_GFp_simple_point_set_to_infinity,
                ec_GFp_simple_set_Jprojective_coordinates_GFp,
                ec_GFp_simple_get_Jprojective_coordinates_GFp,
-               ec_GFp_simple_point_set_affine_coordinates_GFp,
-               ec_GFp_simple_point_get_affine_coordinates_GFp,
-               ec_GFp_simple_set_compressed_coordinates_GFp,
+               ec_GFp_simple_point_set_affine_coordinates,
+               ec_GFp_simple_point_get_affine_coordinates,
+               ec_GFp_simple_set_compressed_coordinates,
                ec_GFp_simple_point2oct,
                ec_GFp_simple_oct2point,
                ec_GFp_simple_add,
@@ -88,26 +95,33 @@ 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,
+               0 /* mul */,
+               0 /* precompute_mult */,
+               0 /* have_precompute_mult */,   
                ec_GFp_recp_field_mul,
                ec_GFp_recp_field_sqr,
-               ec_GFp_recp_field_encode,
-               ec_GFp_recp_field_decode };
+               0 /* field_div */,
+               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;
        }
 
-
-int ec_GFp_recp_group_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
+/* Avoid "redundant redeclaration" warnings */
+#if 0
+int ec_GFp_recp_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
 /* TODO */
 
 
@@ -129,11 +143,4 @@ 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 */
+#endif