diff options
| -rw-r--r-- | lib/libcrypto/ec/ec.h | 9 | ||||
| -rw-r--r-- | lib/libcrypto/ec/ec_local.h | 13 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/libcrypto/ec/ec.h b/lib/libcrypto/ec/ec.h index 519e192bda8..6b5d7b4af7a 100644 --- a/lib/libcrypto/ec/ec.h +++ b/lib/libcrypto/ec/ec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec.h,v 1.40 2023/04/27 07:04:23 tb Exp $ */ +/* $OpenBSD: ec.h,v 1.41 2023/04/27 07:10:05 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -193,12 +193,7 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p, int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p, const BIGNUM *x, int y_bit, BN_CTX *ctx); -#if defined(LIBRESSL_INTERNAL) -int EC_POINT_set_Jprojective_coordinates(const EC_GROUP *group, EC_POINT *p, - const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx); -int EC_POINT_get_Jprojective_coordinates(const EC_GROUP *group, - const EC_POINT *p, BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx); -#else +#ifndef LIBRESSL_INTERNAL int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *p, const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx); int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, diff --git a/lib/libcrypto/ec/ec_local.h b/lib/libcrypto/ec/ec_local.h index 95ef6fba7c4..6e799137a33 100644 --- a/lib/libcrypto/ec/ec_local.h +++ b/lib/libcrypto/ec/ec_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_local.h,v 1.12 2023/04/25 19:26:45 tb Exp $ */ +/* $OpenBSD: ec_local.h,v 1.13 2023/04/27 07:10:05 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -408,8 +408,15 @@ int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len, const ECDSA_SIG *sig, EC_KEY *eckey); void *EC_KEY_get_key_method_data(EC_KEY *key, - void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); + void *(*dup_func)(void *), void (*free_func)(void *), + void (*clear_free_func)(void *)); void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data, - void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *)); + void *(*dup_func)(void *), void (*free_func)(void *), + void (*clear_free_func)(void *)); + +int EC_POINT_set_Jprojective_coordinates(const EC_GROUP *group, EC_POINT *p, + const BIGNUM *x, const BIGNUM *y, const BIGNUM *z, BN_CTX *ctx); +int EC_POINT_get_Jprojective_coordinates(const EC_GROUP *group, + const EC_POINT *p, BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx); __END_HIDDEN_DECLS |