..._init functions are method-specific too

(they can't do much useful, but they will have to set pointers
to NULL)

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 6cc7a9ae1e457f8345fbf54885c0d5aad70a21ce..09f749dd3c23536f83723c62b248e8867f279d36 100644 (file)
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -202,6 +202,7 @@ int ec_GFp_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX
 
 
 /* method functions in ecp_mont.c */
+int ec_GFp_mont_group_init(EC_GROUP *);
 int ec_GFp_mont_group_set_curve_GFp(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 void ec_GFp_mont_group_finish(EC_GROUP *);
 void ec_GFp_mont_group_clear_finish(EC_GROUP *);
@@ -212,6 +213,7 @@ int ec_GFp_mont_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CT
 
 
 /* method functions in ecp_recp.c */
+int ec_GFp_recp_group_init(EC_GROUP *);
 int ec_GFp_recp_group_set_curve_GFp(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 void ec_GFp_recp_group_finish(EC_GROUP *);
 void ec_GFp_recp_group_clear_finish(EC_GROUP *);
@@ -222,6 +224,7 @@ int ec_GFp_recp_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CT
 
 
 /* method functions in ecp_nist.c */
+int ec_GFp_nist_group_init(EC_GROUP *);
 int ec_GFp_nist_group_set_curve_GFp(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 void ec_GFp_nist_group_finish(EC_GROUP *);
 void ec_GFp_nist_group_clear_finish(EC_GROUP *);

diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index 958adadc34e2c21935518d2fc557312c2b58be9c..407175fd9a743a6293b40c9f7c3540a788033af1 100644 (file)
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c
@@ -60,7 +60,7 @@
 const EC_METHOD *EC_GFp_mont_method(void)
        {
        static const EC_METHOD ret = {
-               ec_GFp_simple_group_init,
+               ec_GFp_mont_group_init,
                ec_GFp_mont_group_set_curve_GFp,
                ec_GFp_mont_group_finish,
                ec_GFp_mont_group_clear_finish,

diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index 94a232f74708571824d32a9ab14a171eaf863bf2..f847234faf3aa5decc2032d49ef979dba82f7d60 100644 (file)
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c
@@ -60,7 +60,7 @@
 const EC_METHOD *EC_GFp_nist_method(void)
        {
        static const EC_METHOD ret = {
-               ec_GFp_simple_group_init,
+               ec_GFp_nist_group_init,
                ec_GFp_nist_group_set_curve_GFp,
                ec_GFp_nist_group_finish,
                ec_GFp_nist_group_clear_finish,

diff --git a/crypto/ec/ecp_recp.c b/crypto/ec/ecp_recp.c
index d0fb8f7f1ad5cb5c4f2fe579cdedc0891e609e90..47c8fdd237f1bb65a7dabd559d12248ca2d78383 100644 (file)
--- a/crypto/ec/ecp_recp.c
+++ b/crypto/ec/ecp_recp.c
@@ -60,7 +60,7 @@
 const EC_METHOD *EC_GFp_recp_method(void)
        {
        static const EC_METHOD ret = {
-               ec_GFp_simple_group_init,
+               ec_GFp_recp_group_init,
                ec_GFp_recp_group_set_curve_GFp,
                ec_GFp_recp_group_finish,
                ec_GFp_recp_group_clear_finish,