From 6f8f4431705bb3f8f58f86f9b9f54daa0d42667d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Sat, 10 Mar 2001 23:37:52 +0000 Subject: [PATCH] comment and error code update --- CHANGES | 8 ++++---- crypto/ec/ec.h | 2 +- crypto/ec/ec_err.c | 2 +- crypto/ec/ec_mult.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index dc55a7d1fb..c516fe7087 100644 --- a/CHANGES +++ b/CHANGES @@ -23,14 +23,14 @@ *) Framework for elliptic curves (crypto/ec/ec.h, crypto/ec/ec_lcl.h, crypto/ec/ec_lib.c): - Curves are EC_GROUP objects (with an optional generator) based - on EC_METHODs that are built into the library. + Curves are EC_GROUP objects (with an optional group generator) + based on EC_METHODs that are built into the library. Points are EC_POINT objects based on EC_GROUP objects. Most of the framework would be able to handle curves over arbitrary - finite fields, but as there are no obvious types for GF(2^n), - some functions are limited to GF(p) for now. + finite fields, but as there are no obvious types for fields other + than GF(p), some functions are limited to that for now. [Bodo Moeller] *) Add the -HTTP option to s_server. It is similar to -WWW, but requires diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h index 87c1f457c3..084244457d 100644 --- a/crypto/ec/ec.h +++ b/crypto/ec/ec.h @@ -226,11 +226,11 @@ void ERR_load_EC_strings(void); #define EC_R_INVALID_FIELD 103 #define EC_R_INVALID_FORM 104 #define EC_R_NOT_INITIALIZED 111 -#define EC_R_NO_GENERATOR_SET 113 #define EC_R_NO_SUCH_EXTRA_DATA 105 #define EC_R_POINT_AT_INFINITY 106 #define EC_R_POINT_IS_NOT_ON_CURVE 107 #define EC_R_SLOT_FULL 108 +#define EC_R_UNDEFINED_GENERATOR 113 #ifdef __cplusplus } diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c index 7dd1131f63..f88501502e 100644 --- a/crypto/ec/ec_err.c +++ b/crypto/ec/ec_err.c @@ -122,11 +122,11 @@ static ERR_STRING_DATA EC_str_reasons[]= {EC_R_INVALID_FIELD ,"invalid field"}, {EC_R_INVALID_FORM ,"invalid form"}, {EC_R_NOT_INITIALIZED ,"not initialized"}, -{EC_R_NO_GENERATOR_SET ,"no generator set"}, {EC_R_NO_SUCH_EXTRA_DATA ,"no such extra data"}, {EC_R_POINT_AT_INFINITY ,"point at infinity"}, {EC_R_POINT_IS_NOT_ON_CURVE ,"point is not on curve"}, {EC_R_SLOT_FULL ,"slot full"}, +{EC_R_UNDEFINED_GENERATOR ,"undefined generator"}, {0,NULL} }; diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c index 0515e728ec..ddd3db5921 100644 --- a/crypto/ec/ec_mult.c +++ b/crypto/ec/ec_mult.c @@ -72,7 +72,7 @@ (b) > 23 ? 3 : 1) /* Compute - * \sum scalar[i]*points[i] + * \sum scalars[i]*points[i] * where * scalar*generator * is included in the addition if scalar != NULL @@ -103,7 +103,7 @@ int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, BIGNUM *scalar, generator = EC_GROUP_get0_generator(group); if (generator == NULL) { - ECerr(EC_F_EC_POINTS_MUL, EC_R_NO_GENERATOR_SET); + ECerr(EC_F_EC_POINTS_MUL, EC_R_UNDEFINED_GENERATOR); return 0; } } -- 2.25.1