diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-02-27 00:49:16 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-03-02 16:42:29 +0100 |
| commit | 302d0c0fe48dd0a8d1910afc5c941d607430c72b (patch) | |
| tree | cb4c49c7cb28e43fa634abc7c28dadcbec79825d | |
| parent | messages: MESSAGE_TOTAL is unused (diff) | |
| download | wireguard-monolithic-historical-302d0c0fe48dd0a8d1910afc5c941d607430c72b.tar.xz wireguard-monolithic-historical-302d0c0fe48dd0a8d1910afc5c941d607430c72b.zip | |
global: in gnu code, use un-underscored asm
| -rw-r--r-- | src/compat/memneq/memneq.c | 2 | ||||
| -rw-r--r-- | src/tools/curve25519.c | 2 | ||||
| -rw-r--r-- | src/tools/encoding.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compat/memneq/memneq.c b/src/compat/memneq/memneq.c index 0bcb4b8..1c427d4 100644 --- a/src/compat/memneq/memneq.c +++ b/src/compat/memneq/memneq.c @@ -62,7 +62,7 @@ #include <crypto/algapi.h> /* Make the optimizer believe the variable can be manipulated arbitrarily. */ -#define COMPILER_OPTIMIZER_HIDE_VAR(var) __asm__ ("" : "=r" (var) : "0" (var)) +#define COMPILER_OPTIMIZER_HIDE_VAR(var) asm("" : "=r" (var) : "0" (var)) #ifndef __HAVE_ARCH_CRYPTO_MEMNEQ diff --git a/src/tools/curve25519.c b/src/tools/curve25519.c index 2195040..b030853 100644 --- a/src/tools/curve25519.c +++ b/src/tools/curve25519.c @@ -46,7 +46,7 @@ typedef int64_t s64; static noinline void memzero_explicit(void *s, size_t count) { memset(s, 0, count); - __asm__ __volatile__("": :"r"(s) :"memory"); + asm volatile("": :"r"(s) :"memory"); } #ifdef __SIZEOF_INT128__ diff --git a/src/tools/encoding.c b/src/tools/encoding.c index a8bfd24..cb1b123 100644 --- a/src/tools/encoding.c +++ b/src/tools/encoding.c @@ -113,7 +113,7 @@ bool key_is_zero(const uint8_t key[static WG_KEY_LEN]) for (unsigned int i = 0; i < WG_KEY_LEN; ++i) { acc |= key[i]; - __asm__ ("" : "=r" (acc) : "0" (acc)); + asm("" : "=r" (acc) : "0" (acc)); } return 1 & ((acc - 1) >> 8); } |