|
@@ -13,7 +13,7 @@
|
|
|
# pragma once
|
|
|
|
|
|
# include <openssl/macros.h>
|
|
|
-# if !OPENSSL_API_3
|
|
|
+# ifndef OPENSSL_NO_DEPRECATED_3_0
|
|
|
# define HEADER_EC_H
|
|
|
# endif
|
|
|
|
|
@@ -131,7 +131,7 @@ void EC_GROUP_free(EC_GROUP *group);
|
|
|
/** Clears and frees a EC_GROUP object
|
|
|
* \param group EC_GROUP object to be cleared and freed.
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(void EC_GROUP_clear_free(EC_GROUP *group))
|
|
|
+DEPRECATEDIN_3_0(void EC_GROUP_clear_free(EC_GROUP *group))
|
|
|
|
|
|
/** Copies EC_GROUP objects. Note: both EC_GROUPs must use the same EC_METHOD.
|
|
|
* \param dst destination EC_GROUP object
|
|
@@ -281,7 +281,7 @@ int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p,
|
|
|
+DEPRECATEDIN_3_0(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p,
|
|
|
const BIGNUM *a, const BIGNUM *b,
|
|
|
BN_CTX *ctx))
|
|
|
|
|
@@ -294,7 +294,7 @@ DEPRECATEDIN_3(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p,
|
|
|
+DEPRECATEDIN_3_0(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p,
|
|
|
BIGNUM *a, BIGNUM *b,
|
|
|
BN_CTX *ctx))
|
|
|
|
|
@@ -308,7 +308,7 @@ DEPRECATEDIN_3(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p,
|
|
|
+DEPRECATEDIN_3_0(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p,
|
|
|
const BIGNUM *a, const BIGNUM *b,
|
|
|
BN_CTX *ctx))
|
|
|
|
|
@@ -321,7 +321,7 @@ DEPRECATEDIN_3(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p,
|
|
|
+DEPRECATEDIN_3_0(int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p,
|
|
|
BIGNUM *a, BIGNUM *b,
|
|
|
BN_CTX *ctx))
|
|
|
# endif
|
|
@@ -562,7 +562,7 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
|
|
|
+DEPRECATEDIN_3_0(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
|
|
|
EC_POINT *p,
|
|
|
const BIGNUM *x,
|
|
|
const BIGNUM *y,
|
|
@@ -577,7 +577,7 @@ DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
|
|
|
+DEPRECATEDIN_3_0(int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
|
|
|
const EC_POINT *p,
|
|
|
BIGNUM *x,
|
|
|
BIGNUM *y,
|
|
@@ -604,7 +604,7 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
|
|
|
+DEPRECATEDIN_3_0(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
|
|
|
EC_POINT *p,
|
|
|
const BIGNUM *x,
|
|
|
int y_bit,
|
|
@@ -619,7 +619,7 @@ DEPRECATEDIN_3(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
|
|
|
+DEPRECATEDIN_3_0(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
|
|
|
EC_POINT *p,
|
|
|
const BIGNUM *x,
|
|
|
const BIGNUM *y,
|
|
@@ -634,7 +634,7 @@ DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
|
|
|
+DEPRECATEDIN_3_0(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
|
|
|
const EC_POINT *p,
|
|
|
BIGNUM *x,
|
|
|
BIGNUM *y,
|
|
@@ -649,7 +649,7 @@ DEPRECATEDIN_3(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
|
|
|
* \param ctx BN_CTX object (optional)
|
|
|
* \return 1 on success and 0 if an error occurred
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
|
|
|
+DEPRECATEDIN_3_0(int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
|
|
|
EC_POINT *p,
|
|
|
const BIGNUM *x,
|
|
|
int y_bit,
|
|
@@ -1172,10 +1172,10 @@ EC_KEY *EC_KEY_new_method(ENGINE *engine);
|
|
|
* it is actually specified in ANSI X9.63.
|
|
|
* This identifier is retained for backwards compatibility
|
|
|
*/
|
|
|
-DEPRECATEDIN_3(int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
|
|
|
- const unsigned char *Z, size_t Zlen,
|
|
|
- const unsigned char *sinfo, size_t sinfolen,
|
|
|
- const EVP_MD *md))
|
|
|
+DEPRECATEDIN_3_0(int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
|
|
|
+ const unsigned char *Z, size_t Zlen,
|
|
|
+ const unsigned char *sinfo, size_t sinfolen,
|
|
|
+ const EVP_MD *md))
|
|
|
|
|
|
int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
|
|
|
const EC_KEY *ecdh,
|