diff options
| -rw-r--r-- | contrib/embeddable-wg-library/wireguard.c | 6 | ||||
| -rw-r--r-- | contrib/keygen-html/wireguard.js | 6 | ||||
| -rw-r--r-- | src/curve25519.c | 2 | ||||
| -rw-r--r-- | src/curve25519.h | 2 | ||||
| -rw-r--r-- | src/genkey.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/contrib/embeddable-wg-library/wireguard.c b/contrib/embeddable-wg-library/wireguard.c index 1522c91..51da8ec 100644 --- 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 e96da3e..e262459 100644 --- 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 7949933..0d52bc8 100644 --- 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 a5c3066..badcda0 100644 --- 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 65711e1..645f614 100644 --- 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); |