global: normalize -> clamp

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/contrib/embeddable-wg-library/wireguard.c b/contrib/embeddable-wg-library/wireguard.c
index 1522c9109f3bdb9ad918fac937fa4d2f56df78fa..51da8eceecf4e38f3668f1ef27ee2ca13b5e5ef1 100644 (file)
--- a/contrib/embeddable-wg-library/wireguard.c
+++ b/contrib/embeddable-wg-library/wireguard.c
@@ -1688,7 +1688,7 @@ static void invert(fe o, const fe i)
        memzero_explicit(c, sizeof(c));
 }
 
-static void normalize_key(uint8_t *z)
+static void clamp_key(uint8_t *z)
 {
        z[31] = (z[31] & 127) | 64;
        z[0] &= 248;
@@ -1701,7 +1701,7 @@ void wg_generate_public_key(wg_key public_key, const wg_key private_key)
        fe a = { 1 }, b = { 9 }, c = { 0 }, d = { 1 }, e, f;
 
        memcpy(z, private_key, sizeof(z));
-       normalize_key(z);
+       clamp_key(z);
 
        for (i = 254; i >= 0; --i) {
                r = (z[i >> 3] >> (i & 7)) & 1;
@@ -1745,7 +1745,7 @@ void wg_generate_public_key(wg_key public_key, const wg_key private_key)
 void wg_generate_private_key(wg_key private_key)
 {
        wg_generate_preshared_key(private_key);
-       normalize_key(private_key);
+       clamp_key(private_key);
 }
 
 void wg_generate_preshared_key(wg_key preshared_key)

diff --git a/contrib/keygen-html/wireguard.js b/contrib/keygen-html/wireguard.js
index e96da3e01d854899d696cbf19597de77d9f19c8e..e262459b6378a359e98805cd787c0a2622eb9d61 100644 (file)
--- a/contrib/keygen-html/wireguard.js
+++ b/contrib/keygen-html/wireguard.js
@@ -91,7 +91,7 @@
                        o[a] = c[a];
        }
 
-       function normalizeKey(z) {
+       function clamp(z) {
                z[31] = (z[31] & 127) | 64;
                z[0] &= 248;
        }
@@ -108,7 +108,7 @@
                        _9 = gf([9]);
                for (var i = 0; i < 32; ++i)
                        z[i] = privateKey[i];
-               normalizeKey(z);
+               clamp(z);
                for (var i = 254; i >= 0; --i) {
                        r = (z[i >>> 3] >>> (i & 7)) & 1;
                        cswap(a, b, r);
@@ -148,7 +148,7 @@
 
        function generatePrivateKey() {
                var privateKey = generatePresharedKey();
-               normalizeKey(privateKey);
+               clamp(privateKey);
                return privateKey;
        }
 

diff --git a/src/curve25519.c b/src/curve25519.c
index 79499338c9f71506312109003f58af18fc095f6d..0d52bc87839d68aaa26bb6506495d3e62635ec3d 100644 (file)
--- a/src/curve25519.c
+++ b/src/curve25519.c
@@ -68,7 +68,7 @@ static inline void put_unaligned_le64(u64 s, u8 *d)
 #ifndef __force
 #define __force
 #endif
-#define normalize_secret(a) curve25519_normalize_secret(a)
+#define clamp_secret(a) curve25519_clamp_secret(a)
 
 static noinline void memzero_explicit(void *s, size_t count)
 {

diff --git a/src/curve25519.h b/src/curve25519.h
index a5c30663000ef02bab9c4605143b4999534d3aba..badcda0c95a7c12de39e940b6c62d1384a5fffd5 100644 (file)
--- a/src/curve25519.h
+++ b/src/curve25519.h
@@ -15,7 +15,7 @@ enum curve25519_lengths {
 
 void curve25519(uint8_t mypublic[static CURVE25519_KEY_SIZE], const uint8_t secret[static CURVE25519_KEY_SIZE], const uint8_t basepoint[static CURVE25519_KEY_SIZE]);
 void curve25519_generate_public(uint8_t pub[static CURVE25519_KEY_SIZE], const uint8_t secret[static CURVE25519_KEY_SIZE]);
-static inline void curve25519_normalize_secret(uint8_t secret[static CURVE25519_KEY_SIZE])
+static inline void curve25519_clamp_secret(uint8_t secret[static CURVE25519_KEY_SIZE])
 {
        secret[0] &= 248;
        secret[31] &= 127;

diff --git a/src/genkey.c b/src/genkey.c
index 65711e16b250fe69ba8939c4f918e78413c63533..645f6149e7860bd81eca3519b7336c2b58f59426 100644 (file)
--- a/src/genkey.c
+++ b/src/genkey.c
@@ -71,7 +71,7 @@ int genkey_main(int argc, char *argv[])
                return 1;
        }
        if (!strcmp(argv[0], "genkey"))
-               curve25519_normalize_secret(key);
+               curve25519_clamp_secret(key);
 
        key_to_base64(base64, key);
        puts(base64);