From 777fe674c4c534bb0b9a97c4e5d90f06343c8f23 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 11 Jan 2019 01:13:35 -0800 Subject: global: normalize -> clamp Signed-off-by: Jason A. Donenfeld --- contrib/embeddable-wg-library/wireguard.c | 6 +++--- contrib/keygen-html/wireguard.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'contrib') 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; } -- cgit v1.2.3-59-g8ed1b