diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-01-11 01:13:35 -0800 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-01-23 14:29:44 +0100 |
commit | 6f0fc6cb3e453b2082678cf6f59f4cc349f49b0e (patch) | |
tree | 91e160308241ade8cc55efc0d1295f5e438dfa89 /src/crypto/zinc/curve25519/curve25519.c | |
parent | keygen-html: bring back pure javascript implementation (diff) | |
download | wireguard-monolithic-historical-6f0fc6cb3e453b2082678cf6f59f4cc349f49b0e.tar.xz wireguard-monolithic-historical-6f0fc6cb3e453b2082678cf6f59f4cc349f49b0e.zip |
global: normalize -> clamp
Diffstat (limited to 'src/crypto/zinc/curve25519/curve25519.c')
-rw-r--r-- | src/crypto/zinc/curve25519/curve25519.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/crypto/zinc/curve25519/curve25519.c b/src/crypto/zinc/curve25519/curve25519.c index f1bfe86..6b3f12a 100644 --- a/src/crypto/zinc/curve25519/curve25519.c +++ b/src/crypto/zinc/curve25519/curve25519.c @@ -20,6 +20,13 @@ #include <linux/init.h> #include <crypto/algapi.h> // For crypto_memneq. +static __always_inline void clamp_secret(u8 secret[CURVE25519_KEY_SIZE]) +{ + secret[0] &= 248; + secret[31] &= 127; + secret[31] |= 64; +} + #if defined(CONFIG_ZINC_ARCH_X86_64) #include "curve25519-x86_64-glue.c" #elif defined(CONFIG_ZINC_ARCH_ARM) @@ -42,13 +49,6 @@ static inline bool curve25519_base_arch(u8 pub[CURVE25519_KEY_SIZE], } #endif -static __always_inline void normalize_secret(u8 secret[CURVE25519_KEY_SIZE]) -{ - secret[0] &= 248; - secret[31] &= 127; - secret[31] |= 64; -} - #if defined(CONFIG_ARCH_SUPPORTS_INT128) && defined(__SIZEOF_INT128__) #include "curve25519-hacl64.c" #else @@ -84,7 +84,7 @@ EXPORT_SYMBOL(curve25519_generate_public); void curve25519_generate_secret(u8 secret[CURVE25519_KEY_SIZE]) { get_random_bytes_wait(secret, CURVE25519_KEY_SIZE); - normalize_secret(secret); + clamp_secret(secret); } EXPORT_SYMBOL(curve25519_generate_secret); |