yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove references to some Montgomery curves

Browse source 
After all it looks like those won't become standard.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-06-23 00:13:02 +02:00
parent 9386664543
commit 7320eb46d4
6 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/mbedtls/compat-1.3.h
View file

@ -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 @@
#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

3
include/mbedtls/config.h
View file

@ -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

3
include/mbedtls/ecp.h
View file

@ -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 */

5
library/ecp.c
View file

@ -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

9
library/version_features.c
View file

@ -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 */

6
scripts/data_files/rename-1.3-2.0.txt
View file

@ -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