From ca92a35d019730aec9d3ec8097dcbb9633a69874 Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Wed, 1 Feb 2023 11:44:28 +0100 Subject: [PATCH] field: Simplify code in secp256k1_fe_set_b32 --- src/field_10x26_impl.h | 9 ++------- src/field_5x52_impl.h | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/field_10x26_impl.h b/src/field_10x26_impl.h index 2c10814f..9fd8de80 100644 --- a/src/field_10x26_impl.h +++ b/src/field_10x26_impl.h @@ -367,13 +367,8 @@ static int secp256k1_fe_set_b32(secp256k1_fe *r, const unsigned char *a) { ret = !((r->n[9] == 0x3FFFFFUL) & ((r->n[8] & r->n[7] & r->n[6] & r->n[5] & r->n[4] & r->n[3] & r->n[2]) == 0x3FFFFFFUL) & ((r->n[1] + 0x40UL + ((r->n[0] + 0x3D1UL) >> 26)) > 0x3FFFFFFUL)); #ifdef VERIFY r->magnitude = 1; - if (ret) { - r->normalized = 1; - secp256k1_fe_verify(r); - } else { - r->normalized = 0; - secp256k1_fe_verify(r); - } + r->normalized = ret; + secp256k1_fe_verify(r); #endif return ret; } diff --git a/src/field_5x52_impl.h b/src/field_5x52_impl.h index d92def5c..4262542f 100644 --- a/src/field_5x52_impl.h +++ b/src/field_5x52_impl.h @@ -342,13 +342,8 @@ static int secp256k1_fe_set_b32(secp256k1_fe *r, const unsigned char *a) { ret = !((r->n[4] == 0x0FFFFFFFFFFFFULL) & ((r->n[3] & r->n[2] & r->n[1]) == 0xFFFFFFFFFFFFFULL) & (r->n[0] >= 0xFFFFEFFFFFC2FULL)); #ifdef VERIFY r->magnitude = 1; - if (ret) { - r->normalized = 1; - secp256k1_fe_verify(r); - } else { - r->normalized = 0; - secp256k1_fe_verify(r); - } + r->normalized = ret; + secp256k1_fe_verify(r); #endif return ret; }