From 6f0fc6cb3e453b2082678cf6f59f4cc349f49b0e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 11 Jan 2019 01:13:35 -0800 Subject: global: normalize -> clamp --- src/crypto/zinc/curve25519/curve25519-fiat32.c | 2 +- src/crypto/zinc/curve25519/curve25519-hacl64.c | 2 +- src/crypto/zinc/curve25519/curve25519-x86_64.c | 7 ------- src/crypto/zinc/curve25519/curve25519.c | 16 ++++++++-------- src/tools/curve25519.c | 2 +- src/tools/curve25519.h | 2 +- src/tools/genkey.c | 2 +- 7 files changed, 13 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/crypto/zinc/curve25519/curve25519-fiat32.c b/src/crypto/zinc/curve25519/curve25519-fiat32.c index 60a04e4..7f4f01c 100644 --- a/src/crypto/zinc/curve25519/curve25519-fiat32.c +++ b/src/crypto/zinc/curve25519/curve25519-fiat32.c @@ -760,7 +760,7 @@ static void curve25519_generic(u8 out[CURVE25519_KEY_SIZE], u8 e[32]; memcpy(e, scalar, 32); - normalize_secret(e); + clamp_secret(e); /* The following implementation was transcribed to Coq and proven to * correspond to unary scalar multiplication in affine coordinates given diff --git a/src/crypto/zinc/curve25519/curve25519-hacl64.c b/src/crypto/zinc/curve25519/curve25519-hacl64.c index 9129239..ff22d3b 100644 --- a/src/crypto/zinc/curve25519/curve25519-hacl64.c +++ b/src/crypto/zinc/curve25519/curve25519-hacl64.c @@ -767,7 +767,7 @@ static void curve25519_generic(u8 mypublic[CURVE25519_KEY_SIZE], u8 e[32] __aligned(32) = { 0 }; u8 *scalar; memcpy(e, secret, 32); - normalize_secret(e); + clamp_secret(e); scalar = e; { u64 buf[15] = { 0 }; diff --git a/src/crypto/zinc/curve25519/curve25519-x86_64.c b/src/crypto/zinc/curve25519/curve25519-x86_64.c index 239e345..81ef575 100644 --- a/src/crypto/zinc/curve25519/curve25519-x86_64.c +++ b/src/crypto/zinc/curve25519/curve25519-x86_64.c @@ -1935,13 +1935,6 @@ static __always_inline void cselect(u8 bit, u64 *const px, const u64 *const py) ); } -static __always_inline void clamp_secret(u8 secret[CURVE25519_KEY_SIZE]) -{ - secret[0] &= 248; - secret[31] &= 127; - secret[31] |= 64; -} - static void curve25519_adx(u8 shared[CURVE25519_KEY_SIZE], const u8 private_key[CURVE25519_KEY_SIZE], const u8 session_key[CURVE25519_KEY_SIZE]) 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 #include // 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); diff --git a/src/tools/curve25519.c b/src/tools/curve25519.c index 7949933..0d52bc8 100644 --- a/src/tools/curve25519.c +++ b/src/tools/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/tools/curve25519.h b/src/tools/curve25519.h index a5c3066..badcda0 100644 --- a/src/tools/curve25519.h +++ b/src/tools/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/tools/genkey.c b/src/tools/genkey.c index 65711e1..645f614 100644 --- a/src/tools/genkey.c +++ b/src/tools/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); -- cgit v1.2.3-59-g8ed1b