Move ecp_restartable definitions out of the MBEDTLS_ECP_ALT guards
As there are some definitions that are defined regardless of whether MBEDTLS_ECP_RESTARTABLE is defined or not, these definitions need to be moved outside the MBEDTLS_ECP_ALT guards. This is a simple move as MBEDTLS_ECP_ALT and MBEDTLS_ECP_RESTARTABLE are mutually exclusive options.
This commit is contained in:
Darryl Green
parent
fb1972db23
commit
a7064c3b8c
1 changed files with 62 additions and 62 deletions
|
|
@ -189,6 +189,68 @@ typedef struct mbedtls_ecp_group
|
||||||
}
|
}
|
||||||
mbedtls_ecp_group;
|
mbedtls_ecp_group;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \name SECTION: Module settings
|
||||||
|
*
|
||||||
|
* The configuration options you can set for this module are in this section.
|
||||||
|
* Either change them in config.h, or define them using the compiler command line.
|
||||||
|
* \{
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !defined(MBEDTLS_ECP_MAX_BITS)
|
||||||
|
/**
|
||||||
|
* The maximum size of the groups, that is, of \c N and \c P.
|
||||||
|
*/
|
||||||
|
#define MBEDTLS_ECP_MAX_BITS 521 /**< The maximum size of groups, in bits. */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define MBEDTLS_ECP_MAX_BYTES ( ( MBEDTLS_ECP_MAX_BITS + 7 ) / 8 )
|
||||||
|
#define MBEDTLS_ECP_MAX_PT_LEN ( 2 * MBEDTLS_ECP_MAX_BYTES + 1 )
|
||||||
|
|
||||||
|
#if !defined(MBEDTLS_ECP_WINDOW_SIZE)
|
||||||
|
/*
|
||||||
|
* Maximum "window" size used for point multiplication.
|
||||||
|
* Default: 6.
|
||||||
|
* Minimum value: 2. Maximum value: 7.
|
||||||
|
*
|
||||||
|
* Result is an array of at most ( 1 << ( MBEDTLS_ECP_WINDOW_SIZE - 1 ) )
|
||||||
|
* points used for point multiplication. This value is directly tied to EC
|
||||||
|
* peak memory usage, so decreasing it by one should roughly cut memory usage
|
||||||
|
* by two (if large curves are in use).
|
||||||
|
*
|
||||||
|
* Reduction in size may reduce speed, but larger curves are impacted first.
|
||||||
|
* Sample performances (in ECDHE handshakes/s, with FIXED_POINT_OPTIM = 1):
|
||||||
|
* w-size: 6 5 4 3 2
|
||||||
|
* 521 145 141 135 120 97
|
||||||
|
* 384 214 209 198 177 146
|
||||||
|
* 256 320 320 303 262 226
|
||||||
|
* 224 475 475 453 398 342
|
||||||
|
* 192 640 640 633 587 476
|
||||||
|
*/
|
||||||
|
#define MBEDTLS_ECP_WINDOW_SIZE 6 /**< The maximum window size used. */
|
||||||
|
#endif /* MBEDTLS_ECP_WINDOW_SIZE */
|
||||||
|
|
||||||
|
#if !defined(MBEDTLS_ECP_FIXED_POINT_OPTIM)
|
||||||
|
/*
|
||||||
|
* Trade memory for speed on fixed-point multiplication.
|
||||||
|
*
|
||||||
|
* This speeds up repeated multiplication of the generator (that is, the
|
||||||
|
* multiplication in ECDSA signatures, and half of the multiplications in
|
||||||
|
* ECDSA verification and ECDHE) by a factor roughly 3 to 4.
|
||||||
|
*
|
||||||
|
* The cost is increasing EC peak memory usage by a factor roughly 2.
|
||||||
|
*
|
||||||
|
* Change this value to 0 to reduce peak memory usage.
|
||||||
|
*/
|
||||||
|
#define MBEDTLS_ECP_FIXED_POINT_OPTIM 1 /**< Enable fixed-point speed-up. */
|
||||||
|
#endif /* MBEDTLS_ECP_FIXED_POINT_OPTIM */
|
||||||
|
|
||||||
|
/* \} name SECTION: Module settings */
|
||||||
|
|
||||||
|
#else /* MBEDTLS_ECP_ALT */
|
||||||
|
#include "ecp_alt.h"
|
||||||
|
#endif /* MBEDTLS_ECP_ALT */
|
||||||
|
|
||||||
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
#if defined(MBEDTLS_ECP_RESTARTABLE)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -253,68 +315,6 @@ typedef void mbedtls_ecp_restart_ctx;
|
||||||
|
|
||||||
#endif /* MBEDTLS_ECP_RESTARTABLE */
|
#endif /* MBEDTLS_ECP_RESTARTABLE */
|
||||||
|
|
||||||
/**
|
|
||||||
* \name SECTION: Module settings
|
|
||||||
*
|
|
||||||
* The configuration options you can set for this module are in this section.
|
|
||||||
* Either change them in config.h, or define them using the compiler command line.
|
|
||||||
* \{
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(MBEDTLS_ECP_MAX_BITS)
|
|
||||||
/**
|
|
||||||
* The maximum size of the groups, that is, of \c N and \c P.
|
|
||||||
*/
|
|
||||||
#define MBEDTLS_ECP_MAX_BITS 521 /**< The maximum size of groups, in bits. */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MBEDTLS_ECP_MAX_BYTES ( ( MBEDTLS_ECP_MAX_BITS + 7 ) / 8 )
|
|
||||||
#define MBEDTLS_ECP_MAX_PT_LEN ( 2 * MBEDTLS_ECP_MAX_BYTES + 1 )
|
|
||||||
|
|
||||||
#if !defined(MBEDTLS_ECP_WINDOW_SIZE)
|
|
||||||
/*
|
|
||||||
* Maximum "window" size used for point multiplication.
|
|
||||||
* Default: 6.
|
|
||||||
* Minimum value: 2. Maximum value: 7.
|
|
||||||
*
|
|
||||||
* Result is an array of at most ( 1 << ( MBEDTLS_ECP_WINDOW_SIZE - 1 ) )
|
|
||||||
* points used for point multiplication. This value is directly tied to EC
|
|
||||||
* peak memory usage, so decreasing it by one should roughly cut memory usage
|
|
||||||
* by two (if large curves are in use).
|
|
||||||
*
|
|
||||||
* Reduction in size may reduce speed, but larger curves are impacted first.
|
|
||||||
* Sample performances (in ECDHE handshakes/s, with FIXED_POINT_OPTIM = 1):
|
|
||||||
* w-size: 6 5 4 3 2
|
|
||||||
* 521 145 141 135 120 97
|
|
||||||
* 384 214 209 198 177 146
|
|
||||||
* 256 320 320 303 262 226
|
|
||||||
* 224 475 475 453 398 342
|
|
||||||
* 192 640 640 633 587 476
|
|
||||||
*/
|
|
||||||
#define MBEDTLS_ECP_WINDOW_SIZE 6 /**< The maximum window size used. */
|
|
||||||
#endif /* MBEDTLS_ECP_WINDOW_SIZE */
|
|
||||||
|
|
||||||
#if !defined(MBEDTLS_ECP_FIXED_POINT_OPTIM)
|
|
||||||
/*
|
|
||||||
* Trade memory for speed on fixed-point multiplication.
|
|
||||||
*
|
|
||||||
* This speeds up repeated multiplication of the generator (that is, the
|
|
||||||
* multiplication in ECDSA signatures, and half of the multiplications in
|
|
||||||
* ECDSA verification and ECDHE) by a factor roughly 3 to 4.
|
|
||||||
*
|
|
||||||
* The cost is increasing EC peak memory usage by a factor roughly 2.
|
|
||||||
*
|
|
||||||
* Change this value to 0 to reduce peak memory usage.
|
|
||||||
*/
|
|
||||||
#define MBEDTLS_ECP_FIXED_POINT_OPTIM 1 /**< Enable fixed-point speed-up. */
|
|
||||||
#endif /* MBEDTLS_ECP_FIXED_POINT_OPTIM */
|
|
||||||
|
|
||||||
/* \} name SECTION: Module settings */
|
|
||||||
|
|
||||||
#else /* MBEDTLS_ECP_ALT */
|
|
||||||
#include "ecp_alt.h"
|
|
||||||
#endif /* MBEDTLS_ECP_ALT */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief The ECP key-pair structure.
|
* \brief The ECP key-pair structure.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue