commit c9f737b4ba075435c6a27f6fff2631762a487c99
author Christoph M. Wintersteiger <cwinter@microsoft.com> Thu Oct 25 13:03:05 2018 +0100
committer Janos Follath <janos.follath@arm.com> Mon Aug 19 13:36:44 2019 +0100
tree a8d4e76f2be021ff104059a35d9a794262958744
parent 696dedaed695a82a5f12f6af4150e2e458cde5a9

ECDH: Enable Everest Curve25519 in ECDH/ECDSA/ECP

library/ecdsa.c

diff --git a/library/ecdsa.c b/library/ecdsa.c
index 58e1a5f..6411a5e 100644
--- a/library/ecdsa.c
+++ b/library/ecdsa.c
@@ -263,8 +263,10 @@
     mbedtls_mpi *pk = &k, *pr = r;
 
     /* Fail cleanly on curves such as Curve25519 that can't be used for ECDSA */
-    if( grp->N.p == NULL )
-        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+    if( grp->id == MBEDTLS_ECP_DP_CURVE25519 ||
+        grp->id == MBEDTLS_ECP_DP_CURVE448 ||
+        grp->N.p == NULL )
+        return( MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE );
 
     /* Make sure d is in range 1..n-1 */
     if( mbedtls_mpi_cmp_int( d, 1 ) < 0 || mbedtls_mpi_cmp_mpi( d, &grp->N ) >= 0 )