From c701d9a4719adff20fa83511f946e4abbd4d8cda Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter@wuille.net>
Date: Mon, 31 Jan 2022 17:15:41 -0500
Subject: [PATCH] Abstract out verify logic for fe_clear

---
 src/field.h            | 7 ++++++-
 src/field_10x26_impl.h | 6 +-----
 src/field_5x52_impl.h  | 6 +-----
 src/field_impl.h       | 8 ++++++++
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/field.h b/src/field.h
index e841f14ee0597..f6f3fa9f17909 100644
--- a/src/field.h
+++ b/src/field.h
@@ -81,6 +81,7 @@ static const secp256k1_fe secp256k1_const_beta = SECP256K1_FE_CONST(
 #  define secp256k1_fe_normalizes_to_zero secp256k1_fe_impl_normalizes_to_zero
 #  define secp256k1_fe_normalizes_to_zero_var secp256k1_fe_impl_normalizes_to_zero_var
 #  define secp256k1_fe_set_int secp256k1_fe_impl_set_int
+#  define secp256k1_fe_clear secp256k1_fe_impl_clear
 #endif /* !defined(VERIFY) */
 
 /** Normalize a field element.
@@ -123,7 +124,11 @@ static int secp256k1_fe_normalizes_to_zero_var(const secp256k1_fe *r);
  */
 static void secp256k1_fe_set_int(secp256k1_fe *r, int a);
 
-/** Sets a field element equal to zero, initializing all fields. */
+/** Set a field element to 0.
+ *
+ * On input, a does not need to be initialized.
+ * On output, a represents 0, is normalized and has magnitude 0.
+ */
 static void secp256k1_fe_clear(secp256k1_fe *a);
 
 /** Verify whether a field element is zero. Requires the input to be normalized. */
diff --git a/src/field_10x26_impl.h b/src/field_10x26_impl.h
index 70be960f8a4b7..7fc9993e00c32 100644
--- a/src/field_10x26_impl.h
+++ b/src/field_10x26_impl.h
@@ -286,12 +286,8 @@ SECP256K1_INLINE static int secp256k1_fe_is_odd(const secp256k1_fe *a) {
     return a->n[0] & 1;
 }
 
-SECP256K1_INLINE static void secp256k1_fe_clear(secp256k1_fe *a) {
+SECP256K1_INLINE static void secp256k1_fe_impl_clear(secp256k1_fe *a) {
     int i;
-#ifdef VERIFY
-    a->magnitude = 0;
-    a->normalized = 1;
-#endif
     for (i=0; i<10; i++) {
         a->n[i] = 0;
     }
diff --git a/src/field_5x52_impl.h b/src/field_5x52_impl.h
index c735257f53dfb..d2c4a6ba25c71 100644
--- a/src/field_5x52_impl.h
+++ b/src/field_5x52_impl.h
@@ -232,12 +232,8 @@ SECP256K1_INLINE static int secp256k1_fe_is_odd(const secp256k1_fe *a) {
     return a->n[0] & 1;
 }
 
-SECP256K1_INLINE static void secp256k1_fe_clear(secp256k1_fe *a) {
+SECP256K1_INLINE static void secp256k1_fe_impl_clear(secp256k1_fe *a) {
     int i;
-#ifdef VERIFY
-    a->magnitude = 0;
-    a->normalized = 1;
-#endif
     for (i=0; i<5; i++) {
         a->n[i] = 0;
     }
diff --git a/src/field_impl.h b/src/field_impl.h
index 0083aabc8d0af..0eccf75023ae3 100644
--- a/src/field_impl.h
+++ b/src/field_impl.h
@@ -194,6 +194,14 @@ SECP256K1_INLINE static void secp256k1_fe_set_int(secp256k1_fe *r, int a) {
     r->normalized = 1;
     secp256k1_fe_verify(r);
 }
+
+static void secp256k1_fe_impl_clear(secp256k1_fe *a);
+SECP256K1_INLINE static void secp256k1_fe_clear(secp256k1_fe *a) {
+    a->magnitude = 0;
+    a->normalized = 1;
+    secp256k1_fe_impl_clear(a);
+    secp256k1_fe_verify(a);
+}
 #endif /* defined(VERIFY) */
 
 #endif /* SECP256K1_FIELD_IMPL_H */