commit 4936beb5136e26271247de49588045f71f740806
author Christoph M. Wintersteiger <cwinter@microsoft.com> Wed Dec 12 17:26:41 2018 +0000
committer Janos Follath <janos.follath@arm.com> Mon Aug 19 13:36:44 2019 +0100
tree d02198ba0c3e230450fe220ad262921dd6599133
parent 48d26c21c61c3f0e1c4ca38035366f8ae968401b

ECDH: Clean up the interface to Everest code

3rdparty/everest/library/x25519.c

diff --git a/3rdparty/everest/library/x25519.c b/3rdparty/everest/library/x25519.c
old mode 100644
new mode 100755
index 72cab6b..830018c
--- a/3rdparty/everest/library/x25519.c
+++ b/3rdparty/everest/library/x25519.c
@@ -27,6 +27,8 @@
 
 #if defined(MBEDTLS_ECDH_C)
 
+#include <mbedtls/ecdh.h>
+
 #include <Hacl_Curve25519.h>
 #include <mbedtls/platform_util.h>
 
@@ -100,16 +102,16 @@
 }
 
 int mbedtls_x25519_get_params( mbedtls_x25519_context *ctx, const mbedtls_ecp_keypair *key,
-                        int side )
+                               mbedtls_x25519_ecdh_side side )
 {
     size_t olen = 0;
 
     switch( side ) {
-    case MBEDTLS_ECDH_THEIRS:
+    case MBEDTLS_X25519_ECDH_THEIRS:
         mbedtls_ecp_point_write_binary( &key->grp, &key->Q, MBEDTLS_ECP_PF_COMPRESSED, &olen, ctx->peer_point, 32 );
         /* untested; defensively throw an error for now. */
         return(MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE);
-    case MBEDTLS_ECDH_OURS:
+    case MBEDTLS_X25519_ECDH_OURS:
         mbedtls_mpi_write_binary( &key->d, ctx->our_secret, 32 );
         /* CMW: key->Q = key->d * base; do we need to set up ctx.peer_point here? */
         /* untested; defensively throw an error for now. */