diff options
author | tb <> | 2024-10-31 15:37:53 +0000 |
---|---|---|
committer | tb <> | 2024-10-31 15:37:53 +0000 |
commit | 65fc25f0127c246c6ca0b80faa55bd49fa2ef13f (patch) | |
tree | 213f15ca307e60a6806d6afab897c0a81c295102 /src/lib/libcrypto/ec/ec_local.h | |
parent | 2f2f748fde73822038414204b26d3d5f3b07d5ba (diff) | |
download | openbsd-65fc25f0127c246c6ca0b80faa55bd49fa2ef13f.tar.gz openbsd-65fc25f0127c246c6ca0b80faa55bd49fa2ef13f.tar.bz2 openbsd-65fc25f0127c246c6ca0b80faa55bd49fa2ef13f.zip |
Retire the oct2point and point2oct EC_METHOD members
Both our remaining EC_METHODs use the methods that used to be called
ec_GFp_simple_{oct2point,point2oct}() so there's no need for the function
pointer indirection. Make the public API call them directly.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/ec/ec_local.h')
-rw-r--r-- | src/lib/libcrypto/ec/ec_local.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/libcrypto/ec/ec_local.h b/src/lib/libcrypto/ec/ec_local.h index 148e94b766..547705e9a6 100644 --- a/src/lib/libcrypto/ec/ec_local.h +++ b/src/lib/libcrypto/ec/ec_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_local.h,v 1.34 2024/10/30 17:52:34 tb Exp $ */ | 1 | /* $OpenBSD: ec_local.h,v 1.35 2024/10/31 15:37:53 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Originally written by Bodo Moeller for the OpenSSL project. | 3 | * Originally written by Bodo Moeller for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -117,12 +117,6 @@ struct ec_method_st { | |||
117 | int (*point_set_compressed_coordinates)(const EC_GROUP *, EC_POINT *, | 117 | int (*point_set_compressed_coordinates)(const EC_GROUP *, EC_POINT *, |
118 | const BIGNUM *x, int y_bit, BN_CTX *); | 118 | const BIGNUM *x, int y_bit, BN_CTX *); |
119 | 119 | ||
120 | size_t (*point2oct)(const EC_GROUP *, const EC_POINT *, | ||
121 | point_conversion_form_t form, unsigned char *buf, size_t len, | ||
122 | BN_CTX *); | ||
123 | int (*oct2point)(const EC_GROUP *, EC_POINT *, const unsigned char *buf, | ||
124 | size_t len, BN_CTX *); | ||
125 | |||
126 | int (*add)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, | 120 | int (*add)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, |
127 | const EC_POINT *b, BN_CTX *); | 121 | const EC_POINT *b, BN_CTX *); |
128 | int (*dbl)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *); | 122 | int (*dbl)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *); |
@@ -282,10 +276,6 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *, const EC_POINT | |||
282 | BIGNUM *x, BIGNUM *y, BN_CTX *); | 276 | BIGNUM *x, BIGNUM *y, BN_CTX *); |
283 | int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *, EC_POINT *, | 277 | int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *, EC_POINT *, |
284 | const BIGNUM *x, int y_bit, BN_CTX *); | 278 | const BIGNUM *x, int y_bit, BN_CTX *); |
285 | size_t ec_GFp_simple_point2oct(const EC_GROUP *, const EC_POINT *, point_conversion_form_t form, | ||
286 | unsigned char *buf, size_t len, BN_CTX *); | ||
287 | int ec_GFp_simple_oct2point(const EC_GROUP *, EC_POINT *, | ||
288 | const unsigned char *buf, size_t len, BN_CTX *); | ||
289 | int ec_GFp_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *); | 279 | int ec_GFp_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *); |
290 | int ec_GFp_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *); | 280 | int ec_GFp_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *); |
291 | int ec_GFp_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *); | 281 | int ec_GFp_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *); |