From: Bodo Möller Date: Wed, 7 Mar 2001 09:29:45 +0000 (+0000) Subject: The next bunch of vaporware. X-Git-Tag: OpenSSL_0_9_6a-beta2~17^2~73 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=58fc62296f9ed6eae19974ae8bdd47b340b1e850;p=oweals%2Fopenssl.git The next bunch of vaporware. --- diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h index 9b25ef163f..092cd050eb 100644 --- a/crypto/ec/ec.h +++ b/crypto/ec/ec.h @@ -1,4 +1,3 @@ -/* TODO */ /* crypto/ec/ec.h */ /* ==================================================================== * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h index fae8feff0f..cea552a736 100644 --- a/crypto/ec/ec_lcl.h +++ b/crypto/ec/ec_lcl.h @@ -1,4 +1,3 @@ -/* TODO */ /* crypto/ec/ec_lcl.h */ /* ==================================================================== * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. @@ -76,7 +75,7 @@ struct ec_method_st { int (*group_set_generator)(EC_GROUP *, const EC_POINT *generator, const BIGNUM *order, const BIGNUM *cofactor); - /* TODO: 'set' functions for EC_GROUPs */ + /* TODO: 'set' and 'get' functions for EC_GROUPs */ /* used by EC_POINT_new, EC_POINT_free, EC_POINT_copy: */ @@ -142,8 +141,6 @@ struct ec_group_st { EC_POINT *generator; /* optional */ BIGNUM order, cofactor; - - /* optional Lim/Lee precomputation table */ } /* EC_GROUP */; @@ -153,7 +150,6 @@ struct ec_group_st { * global ex_data-style index tables. * (Currently, we have one slot only, but is is possible to extend this * if necessary.) */ - int EC_GROUP_set_extra_data(EC_GROUP *, void *extra_data, void *(*extra_data_dup_func)(void *), void (*extra_data_free_func)(void *), void (*extra_data_clear_free_func)(void *)); void *EC_GROUP_get_extra_data(EC_GROUP *, void *(*extra_data_dup_func)(void *), @@ -175,3 +171,52 @@ struct ec_point_st { * (X, Y, Z) represents (X/Z^2, Y/Z^3) if Z != 0 */ int Z_is_one; /* enable optimized point arithmetics for special case */ } /* EC_POINT */; + + + +/* method functions in ecp_smpl.c */ +int ec_GFp_simple_group_init(EC_GROUP *); +int ec_GFp_simple_group_set_curve_GFp(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *); +void ec_GFp_simple_group_finish(EC_GROUP *); +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_generator(EC_GROUP *, const EC_POINT *generator, + const BIGNUM *order, const BIGNUM *cofactor); +/* TODO: 'set' and 'get' functions for EC_GROUPs */ +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 *); +int ec_GFp_simple_point_copy(EC_POINT *, const EC_POINT *); +/* TODO: 'set' and 'get' functions for EC_POINTs */ +size_t ec_GFp_simple_point2oct(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form, + unsigned char *buf, size_t len, BN_CTX *); +int ec_GFp_simple_oct2point(const EC_GROUP *, EC_POINT *, + const unsigned char *buf, size_t len, BN_CTX *); +int ec_GFp_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *); +int ec_GFp_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *); +int ec_GFp_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *); +int ec_GFp_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *); +int ec_GFp_simple_make_affine(const EC_GROUP *, const EC_POINT *, BN_CTX *); +int ec_GFp_simple_field_mult(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *); +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_field_mult(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *); +int ec_GFp_mont_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); +int ec_GFp_mont_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); +int ec_GFp_mont_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); + + +/* method functions in ecp_recp.c */ +int ec_GFp_recp_field_mult(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *); +int ec_GFp_recp_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); +int ec_GFp_recp_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); +int ec_GFp_recp_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); + + +/* method functions in ecp_nist.c */ +int ec_GFp_nist_field_mult(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *); +int ec_GFp_nist_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); +int ec_GFp_nist_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); +int ec_GFp_nist_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *); diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c index 78fcbae61f..ca08ebb152 100644 --- a/crypto/ec/ecp_mont.c +++ b/crypto/ec/ecp_mont.c @@ -59,10 +59,30 @@ const EC_METHOD *EC_GFp_mont_method(void) { - static const EC_METHOD ret = - { - 0 /* XXX */ - }; + static const EC_METHOD ret = { + ec_GFp_simple_group_init, + ec_GFp_simple_group_set_curve_GFp, + ec_GFp_simple_group_finish, + ec_GFp_simple_group_clear_finish, + ec_GFp_simple_group_copy, + ec_GFp_simple_group_set_generator, + /* TODO: 'set' and 'get' functions for EC_GROUPs */ + ec_GFp_simple_point_init, + ec_GFp_simple_point_finish, + ec_GFp_simple_point_clear_finish, + ec_GFp_simple_point_copy, + /* TODO: 'set' and 'get' functions for EC_POINTs */ + ec_GFp_simple_point2oct, + ec_GFp_simple_oct2point, + ec_GFp_simple_add, + ec_GFp_simple_dbl, + ec_GFp_simple_is_at_infinity, + ec_GFp_simple_is_on_curve, + ec_GFp_simple_make_affine, + ec_GFp_mont_field_mult, + ec_GFp_mont_field_sqr, + ec_GFp_mont_field_encode, + ec_GFp_mont_field_decode }; return &ret; } diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c index 0c319c6aed..9bb4ec74a8 100644 --- a/crypto/ec/ecp_nist.c +++ b/crypto/ec/ecp_nist.c @@ -59,10 +59,30 @@ const EC_METHOD *EC_GFp_nist_method(void) { - static const EC_METHOD ret = - { - 0 /* XXX */ - }; + static const EC_METHOD ret = { + ec_GFp_simple_group_init, + ec_GFp_simple_group_set_curve_GFp, + ec_GFp_simple_group_finish, + ec_GFp_simple_group_clear_finish, + ec_GFp_simple_group_copy, + ec_GFp_simple_group_set_generator, + /* TODO: 'set' and 'get' functions for EC_GROUPs */ + ec_GFp_simple_point_init, + ec_GFp_simple_point_finish, + ec_GFp_simple_point_clear_finish, + ec_GFp_simple_point_copy, + /* TODO: 'set' and 'get' functions for EC_POINTs */ + ec_GFp_simple_point2oct, + ec_GFp_simple_oct2point, + ec_GFp_simple_add, + ec_GFp_simple_dbl, + ec_GFp_simple_is_at_infinity, + ec_GFp_simple_is_on_curve, + ec_GFp_simple_make_affine, + ec_GFp_nist_field_mult, + ec_GFp_nist_field_sqr, + ec_GFp_nist_field_encode, + ec_GFp_nist_field_decode }; return &ret; } diff --git a/crypto/ec/ecp_recp.c b/crypto/ec/ecp_recp.c index 4bc2b7ebc5..93d9bd6c94 100644 --- a/crypto/ec/ecp_recp.c +++ b/crypto/ec/ecp_recp.c @@ -59,10 +59,30 @@ const EC_METHOD *EC_GFp_recp_method(void) { - static const EC_METHOD ret = - { - 0 /* XXX */ - }; + static const EC_METHOD ret = { + ec_GFp_simple_group_init, + ec_GFp_simple_group_set_curve_GFp, + ec_GFp_simple_group_finish, + ec_GFp_simple_group_clear_finish, + ec_GFp_simple_group_copy, + ec_GFp_simple_group_set_generator, + /* TODO: 'set' and 'get' functions for EC_GROUPs */ + ec_GFp_simple_point_init, + ec_GFp_simple_point_finish, + ec_GFp_simple_point_clear_finish, + ec_GFp_simple_point_copy, + /* TODO: 'set' and 'get' functions for EC_POINTs */ + ec_GFp_simple_point2oct, + ec_GFp_simple_oct2point, + ec_GFp_simple_add, + ec_GFp_simple_dbl, + ec_GFp_simple_is_at_infinity, + ec_GFp_simple_is_on_curve, + ec_GFp_simple_make_affine, + ec_GFp_recp_field_mult, + ec_GFp_recp_field_sqr, + ec_GFp_recp_field_encode, + ec_GFp_recp_field_decode }; return &ret; } diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c index e02765921c..2d75348923 100644 --- a/crypto/ec/ecp_smpl.c +++ b/crypto/ec/ecp_smpl.c @@ -59,10 +59,30 @@ const EC_METHOD *EC_GFp_simple_method(void) { - static const EC_METHOD ret = - { - 0 /* XXX */ - }; + static const EC_METHOD ret = { + ec_GFp_simple_group_init, + ec_GFp_simple_group_set_curve_GFp, + ec_GFp_simple_group_finish, + ec_GFp_simple_group_clear_finish, + ec_GFp_simple_group_copy, + ec_GFp_simple_group_set_generator, + /* TODO: 'set' and 'get' functions for EC_GROUPs */ + ec_GFp_simple_point_init, + ec_GFp_simple_point_finish, + ec_GFp_simple_point_clear_finish, + ec_GFp_simple_point_copy, + /* TODO: 'set' and 'get' functions for EC_POINTs */ + ec_GFp_simple_point2oct, + ec_GFp_simple_oct2point, + ec_GFp_simple_add, + ec_GFp_simple_dbl, + ec_GFp_simple_is_at_infinity, + ec_GFp_simple_is_on_curve, + ec_GFp_simple_make_affine, + ec_GFp_simple_field_mult, + ec_GFp_simple_field_sqr, + 0 /* field_encode */, + 0 /* field_decode */ }; return &ret; }