mirror of
https://github.com/espressif/mbedtls.git
synced 2025-06-12 05:35:23 +08:00
ecp: revert changes to ECP module and related tests/programs
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
parent
37194b97f8
commit
0b304421d8
@ -1214,7 +1214,6 @@ int mbedtls_ecp_gen_keypair_base(mbedtls_ecp_group *grp,
|
|||||||
* \return An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
|
* \return An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
|
||||||
* on failure.
|
* on failure.
|
||||||
*/
|
*/
|
||||||
#if !defined(MBEDTLS_USE_PSA_CRYPTO)
|
|
||||||
int mbedtls_ecp_gen_keypair(mbedtls_ecp_group *grp, mbedtls_mpi *d,
|
int mbedtls_ecp_gen_keypair(mbedtls_ecp_group *grp, mbedtls_mpi *d,
|
||||||
mbedtls_ecp_point *Q,
|
mbedtls_ecp_point *Q,
|
||||||
int (*f_rng)(void *, unsigned char *, size_t),
|
int (*f_rng)(void *, unsigned char *, size_t),
|
||||||
@ -1236,7 +1235,6 @@ int mbedtls_ecp_gen_keypair(mbedtls_ecp_group *grp, mbedtls_mpi *d,
|
|||||||
int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
|
int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
|
||||||
int (*f_rng)(void *, unsigned char *, size_t),
|
int (*f_rng)(void *, unsigned char *, size_t),
|
||||||
void *p_rng);
|
void *p_rng);
|
||||||
#endif /* !MBEDTLS_USE_PSA_CRYPTO */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief This function reads an elliptic curve private key.
|
* \brief This function reads an elliptic curve private key.
|
||||||
|
@ -3159,7 +3159,6 @@ int mbedtls_ecp_gen_privkey(const mbedtls_ecp_group *grp,
|
|||||||
return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
|
return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(MBEDTLS_USE_PSA_CRYPTO)
|
|
||||||
/*
|
/*
|
||||||
* Generate a keypair with configurable base point
|
* Generate a keypair with configurable base point
|
||||||
*/
|
*/
|
||||||
@ -3201,7 +3200,6 @@ int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
|
|||||||
|
|
||||||
return mbedtls_ecp_gen_keypair(&key->grp, &key->d, &key->Q, f_rng, p_rng);
|
return mbedtls_ecp_gen_keypair(&key->grp, &key->d, &key->Q, f_rng, p_rng);
|
||||||
}
|
}
|
||||||
#endif /* !MBEDTLS_USE_PSA_CRYPTO */
|
|
||||||
|
|
||||||
#define ECP_CURVE25519_KEY_SIZE 32
|
#define ECP_CURVE25519_KEY_SIZE 32
|
||||||
#define ECP_CURVE448_KEY_SIZE 56
|
#define ECP_CURVE448_KEY_SIZE 56
|
||||||
|
@ -321,7 +321,7 @@ usage:
|
|||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
#endif /* MBEDTLS_RSA_C */
|
#endif /* MBEDTLS_RSA_C */
|
||||||
#if defined(MBEDTLS_ECP_C) && !defined(MBEDTLS_USE_PSA_CRYPTO)
|
#if defined(MBEDTLS_ECP_C)
|
||||||
if (opt.type == MBEDTLS_PK_ECKEY) {
|
if (opt.type == MBEDTLS_PK_ECKEY) {
|
||||||
ret = mbedtls_ecp_gen_key((mbedtls_ecp_group_id) opt.ec_curve,
|
ret = mbedtls_ecp_gen_key((mbedtls_ecp_group_id) opt.ec_curve,
|
||||||
mbedtls_pk_ec(key),
|
mbedtls_pk_ec(key),
|
||||||
|
@ -987,7 +987,7 @@ exit:
|
|||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE depends_on:!MBEDTLS_USE_PSA_CRYPTO */
|
/* BEGIN_CASE */
|
||||||
void mbedtls_ecp_gen_keypair(int id)
|
void mbedtls_ecp_gen_keypair(int id)
|
||||||
{
|
{
|
||||||
mbedtls_ecp_group grp;
|
mbedtls_ecp_group grp;
|
||||||
@ -1016,7 +1016,7 @@ exit:
|
|||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE depends_on:!MBEDTLS_USE_PSA_CRYPTO */
|
/* BEGIN_CASE */
|
||||||
void mbedtls_ecp_gen_key(int id)
|
void mbedtls_ecp_gen_key(int id)
|
||||||
{
|
{
|
||||||
mbedtls_ecp_keypair key;
|
mbedtls_ecp_keypair key;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user