From 812b44d58eede833d5553ec2d4854c7a83d3bde4 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Mon, 8 Feb 2021 20:25:01 +0700 Subject: [PATCH] guard check on prime with macro WOLFSSL_VALIDATE_ECC_IMPORT --- wolfcrypt/src/ecc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c index 13a0122b8..691d0ffc8 100644 --- a/wolfcrypt/src/ecc.c +++ b/wolfcrypt/src/ecc.c @@ -6931,7 +6931,8 @@ int wc_ecc_import_point_der_ex(byte* in, word32 inLen, const int curve_idx, (ECC_CURVE_FIELD_PRIME | ECC_CURVE_FIELD_AF | ECC_CURVE_FIELD_BF)); - #ifdef WOLFSSL_CUSTOM_CURVES + #if defined(WOLFSSL_CUSTOM_CURVES) && \ + defined(WOLFSSL_VALIDATE_ECC_IMPORT) /* validate prime is prime for custom curves */ if (err == MP_OKAY && curve_idx == ECC_CUSTOM_IDX) { int isPrime = MP_NO; @@ -7838,7 +7839,8 @@ int wc_ecc_import_x963_ex(const byte* in, word32 inLen, ecc_key* key, (ECC_CURVE_FIELD_PRIME | ECC_CURVE_FIELD_AF | ECC_CURVE_FIELD_BF)); - #ifdef WOLFSSL_CUSTOM_CURVES + #if defined(WOLFSSL_CUSTOM_CURVES) && \ + defined(WOLFSSL_VALIDATE_ECC_IMPORT) /* validate prime is prime for custom curves */ if (err == MP_OKAY && key->idx == ECC_CUSTOM_IDX) { int isPrime = MP_NO;