X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ac82eac807a9818e676c316f8afeab5cff2572cd..d1db98ddea35a5ff79d59c98e6b8ae5bed3796c0:/math/f25519.c?ds=sidebyside

diff --git a/math/f25519.c b/math/f25519.c
index a886465e..b33005bc 100644
--- a/math/f25519.c
+++ b/math/f25519.c
@@ -183,7 +183,7 @@ void f25519_load(f25519 *z, const octet xv[32])
    * and lower bounds are achievable.
    *
    * All of the x_i at this point are positive, so we don't need to do
-   * anything wierd when masking them.
+   * anything weird when masking them.
    */
   b = x9&B24; c   = 19&((b >> 19) - (b >> 24)); x9 -= b << 1;
   b = x8&B25; x9 +=      b >> 25;		x8 -= b << 1;
@@ -756,7 +756,7 @@ static void carry_reduce(dblpiece x[NPIECE])
    * signed.
    */
 
-  /*For each piece, we bias it so that floor division (as done by an
+  /* For each piece, we bias it so that floor division (as done by an
    * arithmetic right shift) and modulus (as done by bitwise-AND) does the
    * right thing.
    */
@@ -1178,6 +1178,7 @@ int f25519_quosqrt(f25519 *z, const f25519 *x, const f25519 *y)
 
 #ifdef TEST_RIG
 
+#include <mLib/macros.h>
 #include <mLib/report.h>
 #include <mLib/str.h>
 #include <mLib/testrig.h>
@@ -1218,7 +1219,7 @@ static void dump_f25519_ref(dstr *d, FILE *fp)
 }
 
 static int eq(const f25519 *x, dstr *d)
-  { octet b[32]; f25519_store(b, x); return (memcmp(b, d->buf, 32) == 0); }
+  { octet b[32]; f25519_store(b, x); return (MEMCMP(b, ==, d->buf, 32)); }
 
 static const test_type
   type_f25519 = { cvt_f25519, dump_f25519 },