diff options
author | tb <> | 2023-04-27 07:10:05 +0000 |
---|---|---|
committer | tb <> | 2023-04-27 07:10:05 +0000 |
commit | 0646900621b7eebe185a365387b01ad2705af1d5 (patch) | |
tree | 88a9856457ec849f2c3a3a563867da0b0d5772c9 /src | |
parent | adbe201ecbd761e38994ee2089dd4b89a8087289 (diff) | |
download | openbsd-0646900621b7eebe185a365387b01ad2705af1d5.tar.gz openbsd-0646900621b7eebe185a365387b01ad2705af1d5.tar.bz2 openbsd-0646900621b7eebe185a365387b01ad2705af1d5.zip |
Move EC_POINT_{get,set}_Jprojective_coordinates to ec_local.h
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/ec/ec.h | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/ec/ec_local.h | 13 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h index 519e192bda..6b5d7b4af7 100644 --- a/src/lib/libcrypto/ec/ec.h +++ b/src/lib/libcrypto/ec/ec.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec.h,v 1.40 2023/04/27 07:04:23 tb Exp $ */ | 1 | /* $OpenBSD: ec.h,v 1.41 2023/04/27 07:10:05 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 | */ |
@@ -193,12 +193,7 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p, | |||
193 | int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p, | 193 | int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p, |
194 | const BIGNUM *x, int y_bit, BN_CTX *ctx); | 194 | const BIGNUM *x, int y_bit, BN_CTX *ctx); |
195 | 195 | ||
196 | #if defined(LIBRESSL_INTERNAL) | 196 | #ifndef LIBRESSL_INTERNAL |
197 | int EC_POINT_set_Jprojective_coordinates(const EC_GROUP *group, EC_POINT *p, | ||
198 | const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx); | ||
199 | int EC_POINT_get_Jprojective_coordinates(const EC_GROUP *group, | ||
200 | const EC_POINT *p, BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx); | ||
201 | #else | ||
202 | int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *p, | 197 | int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *p, |
203 | const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx); | 198 | const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx); |
204 | int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, | 199 | int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, |
diff --git a/src/lib/libcrypto/ec/ec_local.h b/src/lib/libcrypto/ec/ec_local.h index 95ef6fba7c..6e799137a3 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.12 2023/04/25 19:26:45 tb Exp $ */ | 1 | /* $OpenBSD: ec_local.h,v 1.13 2023/04/27 07:10:05 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 | */ |
@@ -408,8 +408,15 @@ int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len, | |||
408 | const ECDSA_SIG *sig, EC_KEY *eckey); | 408 | const ECDSA_SIG *sig, EC_KEY *eckey); |
409 | 409 | ||
410 | void *EC_KEY_get_key_method_data(EC_KEY *key, | 410 | void *EC_KEY_get_key_method_data(EC_KEY *key, |
411 | void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); | 411 | void *(*dup_func)(void *), void (*free_func)(void *), |
412 | void (*clear_free_func)(void *)); | ||
412 | void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data, | 413 | void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data, |
413 | void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); | 414 | void *(*dup_func)(void *), void (*free_func)(void *), |
415 | void (*clear_free_func)(void *)); | ||
416 | |||
417 | int EC_POINT_set_Jprojective_coordinates(const EC_GROUP *group, EC_POINT *p, | ||
418 | const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx); | ||
419 | int EC_POINT_get_Jprojective_coordinates(const EC_GROUP *group, | ||
420 | const EC_POINT *p, BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx); | ||
414 | 421 | ||
415 | __END_HIDDEN_DECLS | 422 | __END_HIDDEN_DECLS |