diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-17 17:54:12 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-17 17:54:12 -0700 |
| commit | 7a94f6305812b7ea5748283a6ec9503f4ea9c7e1 (patch) | |
| tree | a0568641d5746c171b15db3e8f6af6a4e7af4fce /node/Salsa20.cpp | |
| parent | db0edf154cd695410ed4322b733637c5a5112825 (diff) | |
| download | infinitytier-7a94f6305812b7ea5748283a6ec9503f4ea9c7e1.tar.gz infinitytier-7a94f6305812b7ea5748283a6ec9503f4ea9c7e1.zip | |
Back out NaCl since the old one with xmm6 salsa2012 does not support multi-block use and the new one is slower.
Diffstat (limited to 'node/Salsa20.cpp')
| -rw-r--r-- | node/Salsa20.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
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 |