aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-08-28 23:50:35 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2018-09-03 23:52:11 -0600
commit4d59d1f2c585d11d459089edbdec3e65b06ebb58 (patch)
tree57f1ecc3259dace6d7cff22311a39e4ba4281e10
parentwg: ipc: do not warn on unrecognized netlink attributes (diff)
downloadwireguard-tools-4d59d1f2c585d11d459089edbdec3e65b06ebb58.tar.xz
wireguard-tools-4d59d1f2c585d11d459089edbdec3e65b06ebb58.zip
crypto: import zinc
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--contrib/keygen-html/src/curve25519_generate.c2
-rw-r--r--src/curve25519.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/keygen-html/src/curve25519_generate.c b/contrib/keygen-html/src/curve25519_generate.c
index 3b560a5..ae7bda6 100644
--- a/contrib/keygen-html/src/curve25519_generate.c
+++ b/contrib/keygen-html/src/curve25519_generate.c
@@ -44,7 +44,7 @@ static __always_inline void normalize_secret(u8 secret[CURVE25519_POINT_SIZE])
secret[31] |= 64;
}
-#include "../../../../src/crypto/curve25519-fiat32.h"
+#include "../../../../src/crypto/zinc/curve25519/curve25519-fiat32.h"
EMSCRIPTEN_KEEPALIVE void curve25519_generate_public(u8 public[static 32], const u8 private[static 32])
{
diff --git a/src/curve25519.c b/src/curve25519.c
index 043aefc..8197c17 100644
--- a/src/curve25519.c
+++ b/src/curve25519.c
@@ -53,9 +53,9 @@ static noinline void memzero_explicit(void *s, size_t count)
}
#ifdef __SIZEOF_INT128__
-#include "../crypto/curve25519-hacl64.h"
+#include "../crypto/zinc/curve25519/curve25519-hacl64.h"
#else
-#include "../crypto/curve25519-fiat32.h"
+#include "../crypto/zinc/curve25519/curve25519-fiat32.h"
#endif
void curve25519_generate_public(uint8_t pub[static CURVE25519_POINT_SIZE], const uint8_t secret[static CURVE25519_POINT_SIZE])