simplify asn1_flag

[openssl.git] / crypto / ec / ec_lcl.h

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index cc4cf277550dcba2f265465b788a2e93de777910..1c2ae93bb6ab198d580694779208e441aba3061c 100644 (file)
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -56,6 +56,7 @@
 
 #include <stdlib.h>
 
+#include <openssl/obj_mac.h>
 #include <openssl/ec.h>
 
 
@@ -63,6 +64,9 @@
  * so all this may change in future versions. */
 
 struct ec_method_st {
+       /* used by EC_METHOD_get_field_type: */
+       int field_type; /* a NID */
+
        /* used by EC_GROUP_new, EC_GROUP_free, EC_GROUP_clear_free, EC_GROUP_copy: */
        int (*group_init)(EC_GROUP *);
        void (*group_finish)(EC_GROUP *);
@@ -73,14 +77,8 @@ struct ec_method_st {
        int (*group_set_curve_GFp)(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
        int (*group_get_curve_GFp)(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *);
 
-       /* used by EC_GROUP_set_generator, EC_GROUP_get0_generator,
-        * EC_GROUP_get_order, EC_GROUP_get_cofactor:
-        */
-       int (*group_set_generator)(EC_GROUP *, const EC_POINT *generator,
-               const BIGNUM *order, const BIGNUM *cofactor);
-       EC_POINT *(*group_get0_generator)(const EC_GROUP *);
-       int (*group_get_order)(const EC_GROUP *, BIGNUM *order, BN_CTX *);
-       int (*group_get_cofactor)(const EC_GROUP *, BIGNUM *cofactor, BN_CTX *);
+       /* used by EC_GROUP_check: */
+       int (*group_check_discriminant)(const EC_GROUP *, BN_CTX *);
 
        /* used by EC_POINT_new, EC_POINT_free, EC_POINT_clear_free, EC_POINT_copy: */
        int (*point_init)(EC_POINT *);
@@ -143,16 +141,29 @@ struct ec_method_st {
 struct ec_group_st {
        const EC_METHOD *meth;
 
+       EC_POINT *generator; /* optional */
+       BIGNUM order, cofactor;
+
+       int curve_name;/* optional NID for named curve */
+       int asn1_flag; /* flag to control the asn1 encoding */
+       point_conversion_form_t asn1_form;
+
        void *extra_data;
        void *(*extra_data_dup_func)(void *);
        void (*extra_data_free_func)(void *);
        void (*extra_data_clear_free_func)(void *);
 
-       /* All members except 'meth' and 'extra_data...' are handled by
-        * the method functions, even if they appear generic */
+       unsigned char *seed; /* XXX */
+       size_t seed_len;     /* XXX */
+
+       /* The following members are handled by the method functions,
+        * even if they appear generic */
        
        BIGNUM field; /* Field specification.
-                      * For curves over GF(p), this is the modulus. */
+                      * For curves over GF(p), this is the modulus;
+                      * for curves over GF(2^m), this is the 
+                      * irreducible polynomial defining the field.
+                      */
 
        BIGNUM a, b; /* Curve coefficients.
                      * (Here the assumption is that BIGNUMs can be used
@@ -160,11 +171,12 @@ struct ec_group_st {
                      * For characteristic  > 3,  the curve is defined
                      * by a Weierstrass equation of the form
                      *     y^2 = x^3 + a*x + b.
+                     * For characteristic  2,  the curve is defined by
+                     * an equation of the form
+                     *     y^2 + x*y = x^3 + a*x^2 + b.
                      */
-       int a_is_minus3; /* enable optimized point arithmetics for special case */
 
-       EC_POINT *generator; /* optional */
-       BIGNUM order, cofactor;
+       int a_is_minus3; /* enable optimized point arithmetics for special case */
 
        void *field_data1; /* method-specific (e.g., Montgomery structure) */
        void *field_data2; /* method-specific */
@@ -208,11 +220,7 @@ void ec_GFp_simple_group_clear_finish(EC_GROUP *);
 int ec_GFp_simple_group_copy(EC_GROUP *, const EC_GROUP *);
 int ec_GFp_simple_group_set_curve_GFp(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 int ec_GFp_simple_group_get_curve_GFp(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *);
-int ec_GFp_simple_group_set_generator(EC_GROUP *, const EC_POINT *generator,
-       const BIGNUM *order, const BIGNUM *cofactor);
-EC_POINT *ec_GFp_simple_group_get0_generator(const EC_GROUP *);
-int ec_GFp_simple_group_get_order(const EC_GROUP *, BIGNUM *order, BN_CTX *);
-int ec_GFp_simple_group_get_cofactor(const EC_GROUP *, BIGNUM *cofactor, BN_CTX *);
+int ec_GFp_simple_group_check_discriminant(const EC_GROUP *, BN_CTX *);
 int ec_GFp_simple_point_init(EC_POINT *);
 void ec_GFp_simple_point_finish(EC_POINT *);
 void ec_GFp_simple_point_clear_finish(EC_POINT *);