From fb72367f960d2d4ae48997e308e3b359631841b7 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 6 Dec 2018 17:23:07 +0000 Subject: [PATCH] ECDH: Remove old code from mbedtls_everest_make_params --- 3rdparty/everest/library/everest.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) mode change 100644 => 100755 3rdparty/everest/library/everest.c diff --git a/3rdparty/everest/library/everest.c b/3rdparty/everest/library/everest.c old mode 100644 new mode 100755 index 2b7861de6..da1e426f9 --- a/3rdparty/everest/library/everest.c +++ b/3rdparty/everest/library/everest.c @@ -70,35 +70,10 @@ int mbedtls_everest_make_params( mbedtls_ecdh_context *ctx, size_t *olen, int( *f_rng )( void *, unsigned char *, size_t ), void *p_rng ) { - int ret = 0; - size_t grp_len; - mbedtls_ecp_group grp; mbedtls_ecdh_context_everest *everest_ctx = &ctx->ctx.everest_ecdh; mbedtls_x25519_context *x25519_ctx = ( mbedtls_x25519_context* )everest_ctx->ctx; - - if( ctx->var != MBEDTLS_ECDH_VARIANT_EVEREST ) - return MBEDTLS_ERR_MPI_BAD_INPUT_DATA; - - mbedtls_ecp_group_init( &grp ); - - if( ( ret = mbedtls_x25519_make_params( x25519_ctx, olen, buf, blen, f_rng, p_rng ) ) != 0 ) - return MBEDTLS_ERR_ECP_BAD_INPUT_DATA; - - mbedtls_ecp_group_load( &grp, MBEDTLS_ECP_DP_CURVE25519 ); - ret = mbedtls_ecp_tls_write_group( &grp, &grp_len, buf, blen ); - mbedtls_ecp_group_free( &grp ); - if (ret != 0) - return( ret ); - - buf += grp_len; - blen -= grp_len; - - if( blen < 32 ) - return MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL; - - memcpy( x25519_ctx->peer_point, buf, 32 ); - *olen = grp_len + 1 + 32; - return( ret ); + if( ctx->var != MBEDTLS_ECDH_VARIANT_EVEREST ) return MBEDTLS_ERR_MPI_BAD_INPUT_DATA; + return mbedtls_x25519_make_params( x25519_ctx, olen, buf, blen, f_rng, p_rng ); } int mbedtls_everest_read_params( mbedtls_ecdh_context *ctx,