From 95aedfea331344b381db9c90cd11c0fcf3ce9532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 24 Aug 2017 13:47:04 +0200 Subject: [PATCH] Remove redundant test on curve type If rsm != NULL then the curve type has to be Short Weierstrass, as we don't implement restartable Montgomery now. If and when we do, then it's better to check for the subcontext only, and not for the curve type. --- library/ecp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/library/ecp.c b/library/ecp.c index 428dc68cf..454820ae5 100644 --- a/library/ecp.c +++ b/library/ecp.c @@ -2234,10 +2234,9 @@ int mbedtls_ecp_mul_restartable( mbedtls_ecp_group *grp, mbedtls_ecp_point *R, MBEDTLS_MPI_CHK( mbedtls_internal_ecp_init( grp ) ); #endif /* MBEDTLS_ECP_INTERNAL_ALT */ -#if defined(MBEDTLS_ECP_RESTARTABLE) && defined(ECP_SHORTWEIERSTRASS) +#if defined(MBEDTLS_ECP_RESTARTABLE) /* skip argument check when restarting */ - if( ecp_get_type( grp ) != ECP_TYPE_SHORT_WEIERSTRASS || - rs_ctx == NULL || rs_ctx->rsm == NULL ) + if( rs_ctx == NULL || rs_ctx->rsm == NULL ) #endif { /* check_privkey is free */