From e1b665e1aab4acf04b3b3e6fd577602dc99d48b9 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Wed, 11 Dec 2013 16:02:58 +0100 Subject: [PATCH] Added POLARSSL_ECP_MAX_SIZE and POLARSSL_ECP_WINDOW_SIZE to config.h --- include/polarssl/config.h | 5 +++++ include/polarssl/ecp.h | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/polarssl/config.h b/include/polarssl/config.h index 0b76f0853..b2c8d637a 100644 --- a/include/polarssl/config.h +++ b/include/polarssl/config.h @@ -1784,6 +1784,11 @@ #define CTR_DRBG_MAX_REQUEST 1024 /**< Maximum number of requested bytes per call */ #define CTR_DRBG_MAX_SEED_INPUT 384 /**< Maximum size of (re)seed buffer */ +// ECP options +// +#define POLARSSL_ECP_MAX_BITS 521 /**< Maximum bit size of groups */ +#define POLARSSL_ECP_WINDOW_SIZE 6 /**< Maximum window size used */ + // Entropy options // #define ENTROPY_MAX_SOURCES 20 /**< Maximum number of sources supported */ diff --git a/include/polarssl/ecp.h b/include/polarssl/ecp.h index a1a37af24..2ab458aea 100644 --- a/include/polarssl/ecp.h +++ b/include/polarssl/ecp.h @@ -161,13 +161,17 @@ typedef struct } ecp_keypair; +#if !defined(POLARSSL_CONFIG_OPTIONS) /** * Maximum size of the groups (that is, of N and P) */ -#define POLARSSL_ECP_MAX_BITS 521 +#define POLARSSL_ECP_MAX_BITS 521 /**< Maximum bit size of groups */ +#endif + #define POLARSSL_ECP_MAX_BYTES ( ( POLARSSL_ECP_MAX_BITS + 7 ) / 8 ) #define POLARSSL_ECP_MAX_PT_LEN ( 2 * POLARSSL_ECP_MAX_BYTES + 1 ) +#if !defined(POLARSSL_CONFIG_OPTIONS) /* * Maximum "window" size used for point multiplication. * Default: 6. @@ -178,7 +182,8 @@ ecp_keypair; * * Reduction in size may reduce speed for big curves. */ -#define POLARSSL_ECP_WINDOW_SIZE 6 /**< Maximum window size used. */ +#define POLARSSL_ECP_WINDOW_SIZE 6 /**< Maximum window size used */ +#endif /* * Point formats, from RFC 4492's enum ECPointFormat