Commit 7320eb46 authored by Manuel Pégourié-Gonnard's avatar Manuel Pégourié-Gonnard
Browse files

Remove references to some Montgomery curves

After all it looks like those won't become standard.
parent 93866645
...@@ -159,18 +159,9 @@ ...@@ -159,18 +159,9 @@
#if defined MBEDTLS_ECP_DP_BP512R1_ENABLED #if defined MBEDTLS_ECP_DP_BP512R1_ENABLED
#define POLARSSL_ECP_DP_BP512R1_ENABLED MBEDTLS_ECP_DP_BP512R1_ENABLED #define POLARSSL_ECP_DP_BP512R1_ENABLED MBEDTLS_ECP_DP_BP512R1_ENABLED
#endif #endif
#if defined MBEDTLS_ECP_DP_M221_ENABLED
#define POLARSSL_ECP_DP_M221_ENABLED MBEDTLS_ECP_DP_M221_ENABLED
#endif
#if defined MBEDTLS_ECP_DP_M255_ENABLED #if defined MBEDTLS_ECP_DP_M255_ENABLED
#define POLARSSL_ECP_DP_M255_ENABLED MBEDTLS_ECP_DP_M255_ENABLED #define POLARSSL_ECP_DP_M255_ENABLED MBEDTLS_ECP_DP_M255_ENABLED
#endif #endif
#if defined MBEDTLS_ECP_DP_M383_ENABLED
#define POLARSSL_ECP_DP_M383_ENABLED MBEDTLS_ECP_DP_M383_ENABLED
#endif
#if defined MBEDTLS_ECP_DP_M511_ENABLED
#define POLARSSL_ECP_DP_M511_ENABLED MBEDTLS_ECP_DP_M511_ENABLED
#endif
#if defined MBEDTLS_ECP_DP_SECP192K1_ENABLED #if defined MBEDTLS_ECP_DP_SECP192K1_ENABLED
#define POLARSSL_ECP_DP_SECP192K1_ENABLED MBEDTLS_ECP_DP_SECP192K1_ENABLED #define POLARSSL_ECP_DP_SECP192K1_ENABLED MBEDTLS_ECP_DP_SECP192K1_ENABLED
#endif #endif
...@@ -1051,10 +1042,7 @@ ...@@ -1051,10 +1042,7 @@
#define POLARSSL_ECP_DP_BP256R1 MBEDTLS_ECP_DP_BP256R1 #define POLARSSL_ECP_DP_BP256R1 MBEDTLS_ECP_DP_BP256R1
#define POLARSSL_ECP_DP_BP384R1 MBEDTLS_ECP_DP_BP384R1 #define POLARSSL_ECP_DP_BP384R1 MBEDTLS_ECP_DP_BP384R1
#define POLARSSL_ECP_DP_BP512R1 MBEDTLS_ECP_DP_BP512R1 #define POLARSSL_ECP_DP_BP512R1 MBEDTLS_ECP_DP_BP512R1
#define POLARSSL_ECP_DP_M221 MBEDTLS_ECP_DP_M221
#define POLARSSL_ECP_DP_M255 MBEDTLS_ECP_DP_M255 #define POLARSSL_ECP_DP_M255 MBEDTLS_ECP_DP_M255
#define POLARSSL_ECP_DP_M383 MBEDTLS_ECP_DP_M383
#define POLARSSL_ECP_DP_M511 MBEDTLS_ECP_DP_M511
#define POLARSSL_ECP_DP_MAX MBEDTLS_ECP_DP_MAX #define POLARSSL_ECP_DP_MAX MBEDTLS_ECP_DP_MAX
#define POLARSSL_ECP_DP_NONE MBEDTLS_ECP_DP_NONE #define POLARSSL_ECP_DP_NONE MBEDTLS_ECP_DP_NONE
#define POLARSSL_ECP_DP_SECP192K1 MBEDTLS_ECP_DP_SECP192K1 #define POLARSSL_ECP_DP_SECP192K1 MBEDTLS_ECP_DP_SECP192K1
......
...@@ -421,10 +421,7 @@ ...@@ -421,10 +421,7 @@
#define MBEDTLS_ECP_DP_BP256R1_ENABLED #define MBEDTLS_ECP_DP_BP256R1_ENABLED
#define MBEDTLS_ECP_DP_BP384R1_ENABLED #define MBEDTLS_ECP_DP_BP384R1_ENABLED
#define MBEDTLS_ECP_DP_BP512R1_ENABLED #define MBEDTLS_ECP_DP_BP512R1_ENABLED
//#define MBEDTLS_ECP_DP_M221_ENABLED // Not implemented yet!
#define MBEDTLS_ECP_DP_M255_ENABLED #define MBEDTLS_ECP_DP_M255_ENABLED
//#define MBEDTLS_ECP_DP_M383_ENABLED // Not implemented yet!
//#define MBEDTLS_ECP_DP_M511_ENABLED // Not implemented yet!
/** /**
* \def MBEDTLS_ECP_NIST_OPTIM * \def MBEDTLS_ECP_NIST_OPTIM
......
...@@ -62,10 +62,7 @@ typedef enum ...@@ -62,10 +62,7 @@ typedef enum
MBEDTLS_ECP_DP_BP256R1, /*!< 256-bits Brainpool curve */ MBEDTLS_ECP_DP_BP256R1, /*!< 256-bits Brainpool curve */
MBEDTLS_ECP_DP_BP384R1, /*!< 384-bits Brainpool curve */ MBEDTLS_ECP_DP_BP384R1, /*!< 384-bits Brainpool curve */
MBEDTLS_ECP_DP_BP512R1, /*!< 512-bits Brainpool curve */ MBEDTLS_ECP_DP_BP512R1, /*!< 512-bits Brainpool curve */
MBEDTLS_ECP_DP_M221, /*!< (not implemented yet) */
MBEDTLS_ECP_DP_M255, /*!< Curve25519 */ MBEDTLS_ECP_DP_M255, /*!< Curve25519 */
MBEDTLS_ECP_DP_M383, /*!< (not implemented yet) */
MBEDTLS_ECP_DP_M511, /*!< (not implemented yet) */
MBEDTLS_ECP_DP_SECP192K1, /*!< 192-bits "Koblitz" curve */ MBEDTLS_ECP_DP_SECP192K1, /*!< 192-bits "Koblitz" curve */
MBEDTLS_ECP_DP_SECP224K1, /*!< 224-bits "Koblitz" curve */ MBEDTLS_ECP_DP_SECP224K1, /*!< 224-bits "Koblitz" curve */
MBEDTLS_ECP_DP_SECP256K1, /*!< 256-bits "Koblitz" curve */ MBEDTLS_ECP_DP_SECP256K1, /*!< 256-bits "Koblitz" curve */
......
...@@ -98,10 +98,7 @@ static unsigned long add_count, dbl_count, mul_count; ...@@ -98,10 +98,7 @@ static unsigned long add_count, dbl_count, mul_count;
#define ECP_SHORTWEIERSTRASS #define ECP_SHORTWEIERSTRASS
#endif #endif
#if defined(MBEDTLS_ECP_DP_M221_ENABLED) || \ #if defined(MBEDTLS_ECP_DP_M255_ENABLED)
defined(MBEDTLS_ECP_DP_M255_ENABLED) || \
defined(MBEDTLS_ECP_DP_M383_ENABLED) || \
defined(MBEDTLS_ECP_DP_M511_ENABLED)
#define ECP_MONTGOMERY #define ECP_MONTGOMERY
#endif #endif
......
...@@ -226,18 +226,9 @@ static const char *features[] = { ...@@ -226,18 +226,9 @@ static const char *features[] = {
#if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED) #if defined(MBEDTLS_ECP_DP_BP512R1_ENABLED)
"MBEDTLS_ECP_DP_BP512R1_ENABLED", "MBEDTLS_ECP_DP_BP512R1_ENABLED",
#endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */ #endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
#if defined(MBEDTLS_ECP_DP_M221_ENABLED)
"MBEDTLS_ECP_DP_M221_ENABLED",
#endif /* MBEDTLS_ECP_DP_M221_ENABLED */
#if defined(MBEDTLS_ECP_DP_M255_ENABLED) #if defined(MBEDTLS_ECP_DP_M255_ENABLED)
"MBEDTLS_ECP_DP_M255_ENABLED", "MBEDTLS_ECP_DP_M255_ENABLED",
#endif /* MBEDTLS_ECP_DP_M255_ENABLED */ #endif /* MBEDTLS_ECP_DP_M255_ENABLED */
#if defined(MBEDTLS_ECP_DP_M383_ENABLED)
"MBEDTLS_ECP_DP_M383_ENABLED",
#endif /* MBEDTLS_ECP_DP_M383_ENABLED */
#if defined(MBEDTLS_ECP_DP_M511_ENABLED)
"MBEDTLS_ECP_DP_M511_ENABLED",
#endif /* MBEDTLS_ECP_DP_M511_ENABLED */
#if defined(MBEDTLS_ECP_NIST_OPTIM) #if defined(MBEDTLS_ECP_NIST_OPTIM)
"MBEDTLS_ECP_NIST_OPTIM", "MBEDTLS_ECP_NIST_OPTIM",
#endif /* MBEDTLS_ECP_NIST_OPTIM */ #endif /* MBEDTLS_ECP_NIST_OPTIM */
......
...@@ -421,14 +421,8 @@ POLARSSL_ECP_DP_BP384R1 MBEDTLS_ECP_DP_BP384R1 ...@@ -421,14 +421,8 @@ POLARSSL_ECP_DP_BP384R1 MBEDTLS_ECP_DP_BP384R1
POLARSSL_ECP_DP_BP384R1_ENABLED MBEDTLS_ECP_DP_BP384R1_ENABLED POLARSSL_ECP_DP_BP384R1_ENABLED MBEDTLS_ECP_DP_BP384R1_ENABLED
POLARSSL_ECP_DP_BP512R1 MBEDTLS_ECP_DP_BP512R1 POLARSSL_ECP_DP_BP512R1 MBEDTLS_ECP_DP_BP512R1
POLARSSL_ECP_DP_BP512R1_ENABLED MBEDTLS_ECP_DP_BP512R1_ENABLED POLARSSL_ECP_DP_BP512R1_ENABLED MBEDTLS_ECP_DP_BP512R1_ENABLED
POLARSSL_ECP_DP_M221 MBEDTLS_ECP_DP_M221
POLARSSL_ECP_DP_M221_ENABLED MBEDTLS_ECP_DP_M221_ENABLED
POLARSSL_ECP_DP_M255 MBEDTLS_ECP_DP_M255 POLARSSL_ECP_DP_M255 MBEDTLS_ECP_DP_M255
POLARSSL_ECP_DP_M255_ENABLED MBEDTLS_ECP_DP_M255_ENABLED POLARSSL_ECP_DP_M255_ENABLED MBEDTLS_ECP_DP_M255_ENABLED
POLARSSL_ECP_DP_M383 MBEDTLS_ECP_DP_M383
POLARSSL_ECP_DP_M383_ENABLED MBEDTLS_ECP_DP_M383_ENABLED
POLARSSL_ECP_DP_M511 MBEDTLS_ECP_DP_M511
POLARSSL_ECP_DP_M511_ENABLED MBEDTLS_ECP_DP_M511_ENABLED
POLARSSL_ECP_DP_MAX MBEDTLS_ECP_DP_MAX POLARSSL_ECP_DP_MAX MBEDTLS_ECP_DP_MAX
POLARSSL_ECP_DP_NONE MBEDTLS_ECP_DP_NONE POLARSSL_ECP_DP_NONE MBEDTLS_ECP_DP_NONE
POLARSSL_ECP_DP_SECP192K1 MBEDTLS_ECP_DP_SECP192K1 POLARSSL_ECP_DP_SECP192K1 MBEDTLS_ECP_DP_SECP192K1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment