diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-01-18 11:28:32 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-01-18 13:28:16 +0100 |
| commit | f90e36b4661530cc17ac62541452e7e1e521e848 (patch) | |
| tree | 9ab49627551378a08c7f5ed96bc657ada46fdaa6 | |
| parent | curve25519: import 64-bit hacl-star implementation (diff) | |
| download | wireguard-monolithic-historical-f90e36b4661530cc17ac62541452e7e1e521e848.tar.xz wireguard-monolithic-historical-f90e36b4661530cc17ac62541452e7e1e521e848.zip | |
curve25519: resolve symbol clash between fe types
| -rw-r--r-- | src/crypto/curve25519-x86_64.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/crypto/curve25519-x86_64.h b/src/crypto/curve25519-x86_64.h index 2d83d77..dba5812 100644 --- a/src/crypto/curve25519-x86_64.h +++ b/src/crypto/curve25519-x86_64.h @@ -17,10 +17,10 @@ void __init curve25519_fpu_init(void) #endif } -typedef u64 fe[10]; +typedef u64 fex[10]; typedef u64 fe51[5]; -asmlinkage void curve25519_sandy2x_ladder(fe *, const u8 *); -asmlinkage void curve25519_sandy2x_ladder_base(fe *, const u8 *); +asmlinkage void curve25519_sandy2x_ladder(fex *, const u8 *); +asmlinkage void curve25519_sandy2x_ladder_base(fex *, const u8 *); asmlinkage void curve25519_sandy2x_fe51_pack(u8 *, const fe51 *); asmlinkage void curve25519_sandy2x_fe51_mul(fe51 *, const fe51 *, const fe51 *); asmlinkage void curve25519_sandy2x_fe51_nsquare(fe51 *, const fe51 *, int); @@ -30,7 +30,7 @@ static inline u32 le24_to_cpupv(const u8 *in) return le16_to_cpup((__le16 *)in) | ((u32)in[2]) << 16; } -static inline void fe_frombytes(fe h, const u8 *s) +static inline void fex_frombytes(fex h, const u8 *s) { u64 h0 = le32_to_cpup((__le32 *)s); u64 h1 = le24_to_cpupv(s + 4) << 6; @@ -108,7 +108,7 @@ static inline void fe51_invert(fe51 *r, const fe51 *x) static void curve25519_sandy2x(u8 mypublic[CURVE25519_POINT_SIZE], const u8 secret[CURVE25519_POINT_SIZE], const u8 basepoint[CURVE25519_POINT_SIZE]) { u8 e[32]; - fe var[3]; + fex var[3]; fe51 x_51, z_51; memcpy(e, secret, 32); @@ -116,7 +116,7 @@ static void curve25519_sandy2x(u8 mypublic[CURVE25519_POINT_SIZE], const u8 secr #define x1 var[0] #define x2 var[1] #define z2 var[2] - fe_frombytes(x1, basepoint); + fex_frombytes(x1, basepoint); curve25519_sandy2x_ladder(var, e); z_51[0] = (z2[1] << 26) + z2[0]; z_51[1] = (z2[3] << 26) + z2[2]; @@ -144,7 +144,7 @@ static void curve25519_sandy2x(u8 mypublic[CURVE25519_POINT_SIZE], const u8 secr static void curve25519_sandy2x_base(u8 pub[CURVE25519_POINT_SIZE], const u8 secret[CURVE25519_POINT_SIZE]) { u8 e[32]; - fe var[3]; + fex var[3]; fe51 x_51, z_51; memcpy(e, secret, 32); |