From 7a94f6305812b7ea5748283a6ec9503f4ea9c7e1 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 17 Apr 2017 17:54:12 -0700 Subject: Back out NaCl since the old one with xmm6 salsa2012 does not support multi-block use and the new one is slower. --- node/Salsa20.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'node/Salsa20.cpp') diff --git a/node/Salsa20.cpp b/node/Salsa20.cpp index 1e2b4b0f..2a802555 100644 --- a/node/Salsa20.cpp +++ b/node/Salsa20.cpp @@ -10,8 +10,6 @@ #include "Constants.hpp" #include "Salsa20.hpp" -#ifndef ZT_USE_LIBSODIUM - #define ROTATE(v,c) (((v) << (c)) | ((v) >> (32 - (c)))) #define XOR(v,w) ((v) ^ (w)) #define PLUS(v,w) ((uint32_t)((v) + (w))) @@ -1345,5 +1343,3 @@ void Salsa20::crypt20(const void *in,void *out,unsigned int bytes) } } // namespace ZeroTier - -#endif // !ZT_USE_LIBSODIUM -- cgit v1.2.3