From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Wed, 29 Aug 2018 05:50:35 +0000 (-0600)
Subject: crypto: import zinc
X-Git-Tag: v1.0.20191226~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d59d1f2c585d11d459089edbdec3e65b06ebb58;p=thirdparty%2Fwireguard-tools.git

crypto: import zinc

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

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])