commit efdf4d7baa25762e7564738333492ad8876278b9
author Christoph M. Wintersteiger <cwinter@microsoft.com> Fri Feb 15 17:21:04 2019 +0000
committer Janos Follath <janos.follath@arm.com> Mon Aug 19 13:37:46 2019 +0100
tree f5a55a80398c9afe319931beedf0245d5ef18cfa
parent 537f41ebbf2cb848cc5c6ef95bb41fc1e12fb354

ECDH: Fix Everest x25519 make_public

3rdparty/everest/library/x25519.c

diff --git a/3rdparty/everest/library/x25519.c b/3rdparty/everest/library/x25519.c
index e5ec2e8..edaf5da 100644
--- a/3rdparty/everest/library/x25519.c
+++ b/3rdparty/everest/library/x25519.c
@@ -152,14 +152,14 @@
                         int( *f_rng )(void *, unsigned char *, size_t),
                         void *p_rng )
 {
+    int ret = 0;
     unsigned char base[MBEDTLS_X25519_KEY_SIZE_BYTES] = { 0 };
 
-    /* CMW: Is it okay that f_rng, p_rng are not used? */
-    (( void )f_rng);
-    (( void )p_rng);
-
     if( ctx == NULL )
-        return(MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
+        return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
+
+    if( ( ret = f_rng( p_rng, ctx->our_secret, MBEDTLS_X25519_KEY_SIZE_BYTES ) ) != 0 )
+        return ret;
 
     *olen = 33;
     if( blen < *olen )
@@ -173,7 +173,7 @@
     if( memcmp( buf, base, MBEDTLS_X25519_KEY_SIZE_BYTES ) == 0 )
         return MBEDTLS_ERR_ECP_RANDOM_FAILED;
 
-    return(0);
+    return( ret );
 }
 
 int mbedtls_x25519_read_public( mbedtls_x25519_context *ctx,
@@ -184,7 +184,7 @@
     if( (*buf++ != MBEDTLS_X25519_KEY_SIZE_BYTES) )
         return(MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     memcpy( ctx->peer_point, buf, MBEDTLS_X25519_KEY_SIZE_BYTES );
-    return(0);
+    return( 0 );
 }
 
 

programs/test/benchmark.c

diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 7cdff10..244174d 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -1028,16 +1028,9 @@
 
 #if defined(MBEDTLS_ECDH_LEGACY_CONTEXT)
             CHECK_AND_CONTINUE( mbedtls_ecp_group_load(&ecdh_srv.grp, curve_info->grp_id));
-            CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public(&ecdh_srv.grp,
-                                    &ecdh_srv.d,
-                                    &ecdh_srv.Q, myrand, NULL));
 #else
-            if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 ) {
+            if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 )
                 CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh_srv.ctx.mbed_ecdh.grp, curve_info->grp_id ));
-                CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public( &ecdh_srv.ctx.mbed_ecdh.grp,
-                                                &ecdh_srv.ctx.mbed_ecdh.d,
-                                                &ecdh_srv.ctx.mbed_ecdh.Q, myrand, NULL ));
-            }
 #endif
 
             mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name );