mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-10 06:44:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8020 from yanesca/de-duplicate_ecp

Browse Source 
De duplicate the ECP module
This commit is contained in:
Janos Follath 2023-08-04 08:27:09 +00:00 committed by GitHub
commit 73568397a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 3672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/CMakeLists.txt
View File

@ -37,7 +37,6 @@ set(src_crypto
ecdsa.c ecdsa.c
ecjpake.c ecjpake.c
ecp.c ecp.c
ecp_new.c
ecp_curves.c ecp_curves.c
ecp_curves_new.c ecp_curves_new.c
entropy.c entropy.c

1
library/Makefile
View File

@ -102,7 +102,6 @@ OBJS_CRYPTO= \
ecdsa.o \ ecdsa.o \
ecjpake.o \ ecjpake.o \
ecp.o \ ecp.o \
ecp_new.o \
ecp_curves.o \ ecp_curves.o \
ecp_curves_new.o \ ecp_curves_new.o \
entropy.o \ entropy.o \

19
library/ecp.c
View File

@ -43,8 +43,6 @@
#include "common.h" #include "common.h"
#if !defined(MBEDTLS_ECP_WITH_MPI_UINT)
/** /**
* \brief Function level alternative implementation. * \brief Function level alternative implementation.
* *
@ -591,11 +589,14 @@ void mbedtls_ecp_group_free(mbedtls_ecp_group *grp)
} }
if (grp->h != 1) { if (grp->h != 1) {
mbedtls_mpi_free(&grp->P);
mbedtls_mpi_free(&grp->A); mbedtls_mpi_free(&grp->A);
mbedtls_mpi_free(&grp->B); mbedtls_mpi_free(&grp->B);
mbedtls_ecp_point_free(&grp->G); mbedtls_ecp_point_free(&grp->G);
#if !defined(MBEDTLS_ECP_WITH_MPI_UINT)
mbedtls_mpi_free(&grp->N); mbedtls_mpi_free(&grp->N);
mbedtls_mpi_free(&grp->P);
#endif
} }
if (!ecp_group_is_static_comb_table(grp) && grp->T != NULL) { if (!ecp_group_is_static_comb_table(grp) && grp->T != NULL) {
@ -3638,18 +3639,6 @@ cleanup:
#endif /* MBEDTLS_SELF_TEST */ #endif /* MBEDTLS_SELF_TEST */
#if defined(MBEDTLS_TEST_HOOKS)
MBEDTLS_STATIC_TESTABLE
mbedtls_ecp_variant mbedtls_ecp_get_variant(void)
{
return MBEDTLS_ECP_VARIANT_WITH_MPI_STRUCT;
}
#endif /* MBEDTLS_TEST_HOOKS */
#endif /* !MBEDTLS_ECP_ALT */ #endif /* !MBEDTLS_ECP_ALT */
#endif /* MBEDTLS_ECP_LIGHT */ #endif /* MBEDTLS_ECP_LIGHT */
#endif /* !MBEDTLS_ECP_WITH_MPI_UINT */

10
library/ecp_curves.c
View File

@ -5463,6 +5463,16 @@ static int ecp_mod_p256k1(mbedtls_mpi *N)
} }
#endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */ #endif /* MBEDTLS_ECP_DP_SECP256K1_ENABLED */
#if defined(MBEDTLS_TEST_HOOKS)
MBEDTLS_STATIC_TESTABLE
mbedtls_ecp_variant mbedtls_ecp_get_variant(void)
{
return MBEDTLS_ECP_VARIANT_WITH_MPI_STRUCT;
}
#endif /* MBEDTLS_TEST_HOOKS */
#endif /* !MBEDTLS_ECP_ALT */ #endif /* !MBEDTLS_ECP_ALT */
#endif /* MBEDTLS_ECP_LIGHT */ #endif /* MBEDTLS_ECP_LIGHT */

11
library/ecp_curves_new.c
View File

@ -6039,6 +6039,17 @@ int mbedtls_ecp_modulus_setup(mbedtls_mpi_mod_modulus *N,
return 0; return 0;
} }
#endif /* MBEDTLS_TEST_HOOKS */ #endif /* MBEDTLS_TEST_HOOKS */
#if defined(MBEDTLS_TEST_HOOKS)
MBEDTLS_STATIC_TESTABLE
mbedtls_ecp_variant mbedtls_ecp_get_variant(void)
{
return MBEDTLS_ECP_VARIANT_WITH_MPI_UINT;
}
#endif /* MBEDTLS_TEST_HOOKS */
#endif /* !MBEDTLS_ECP_ALT */ #endif /* !MBEDTLS_ECP_ALT */
#endif /* MBEDTLS_ECP_LIGHT */ #endif /* MBEDTLS_ECP_LIGHT */
#endif /* MBEDTLS_ECP_WITH_MPI_UINT */ #endif /* MBEDTLS_ECP_WITH_MPI_UINT */

3655
library/ecp_new.c
View File

File diff suppressed because it is too large Load Diff