commit 568c9cf87828bbeb6fd209250ee16a90f0626f35
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon Sep 16 17:30:04 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 18 14:34:34 2013 +0200
tree bbe3745c73592aaa0307efbd43ab876a70b11f28
parent 7038039f2e2f2e3fa63cf6387f62c6b691e62eb1

Add ecp_supported_curves and simplify some code

programs/pkey/ecdsa.c

diff --git a/programs/pkey/ecdsa.c b/programs/pkey/ecdsa.c
index a88bf1f..d6200f1 100644
--- a/programs/pkey/ecdsa.c
+++ b/programs/pkey/ecdsa.c
@@ -38,30 +38,18 @@
  */
 
 #if !defined(ECPARAMS)
-#if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED)
-#define ECPARAMS    POLARSSL_ECP_DP_SECP192R1
-#elif defined(POLARSSL_ECP_DP_SECP224R1_ENABLED)
-#define ECPARAMS    POLARSSL_ECP_DP_SECP224R1
-#elif defined(POLARSSL_ECP_DP_SECP256R1_ENABLED)
-#define ECPARAMS    POLARSSL_ECP_DP_SECP256R1
-#elif defined(POLARSSL_ECP_DP_SECP384R1_ENABLED)
-#define ECPARAMS    POLARSSL_ECP_DP_SECP384R1
-#elif defined(POLARSSL_ECP_DP_SECP521R1_ENABLED)
-#define ECPARAMS    POLARSSL_ECP_DP_SECP521R1
+#define ECPARAMS    ecp_supported_curves[0].grp_id
 #endif
-#endif /* !defined(ECPARAMS) */
 
 #if !defined(POLARSSL_ECDSA_C) || \
-    !defined(POLARSSL_ENTROPY_C) || !defined(POLARSSL_CTR_DRBG_C) || \
-    !defined(ECPARAMS)
+    !defined(POLARSSL_ENTROPY_C) || !defined(POLARSSL_CTR_DRBG_C)
 int main( int argc, char *argv[] )
 {
     ((void) argc);
     ((void) argv);
 
     printf("POLARSSL_ECDSA_C and/or "
-           "POLARSSL_ENTROPY_C and/or POLARSSL_CTR_DRBG_C not defined,"
-           "and/or no EC domain parameter available\n" );
+           "POLARSSL_ENTROPY_C and/or POLARSSL_CTR_DRBG_C not defined\n"
     return( 0 );
 }
 #else