key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.

[catacomb] / math / f25519.c

diff --git a/math/f25519.c b/math/f25519.c
index 78844be..e9a91f4 100644 (file)
--- a/math/f25519.c
+++ b/math/f25519.c
@@ -50,7 +50,6 @@ typedef uint32 upiece;  typedef uint64 udblpiece;
 
 #define M26 0x03ffffffu
 #define M25 0x01ffffffu
-#define B26 0x04000000u
 #define B25 0x02000000u
 #define B24 0x01000000u
 
@@ -83,11 +82,10 @@ typedef uint16 upiece;  typedef uint32 udblpiece;
     ((i) == 5 || (i) == 10 || (i) == 15 || (i) == 20 || (i) == 25 ? 9 : 10)
 #define NPIECE 26
 
-#define B10 0x0400
-#define B9 0x200
-#define B8 0x100
 #define M10 0x3ff
 #define M9 0x1ff
+#define B9 0x200
+#define B8 0x100
 
 #endif
 
@@ -185,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;