diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-09-25 10:19:59 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-09-25 10:19:59 -0700 |
| commit | 0510f85a8fe6cba7e6258d534fa49d47f9f8e2a2 (patch) | |
| tree | ef9bf53e9dd472a1fb343a41a41630bb30097979 /node/Salsa20.cpp | |
| parent | 5b222d0a09dab1a7e009f728f955a0ef70d569a6 (diff) | |
| parent | 27c37a18f3e2f97d06ebc04e2db31d0c796c9452 (diff) | |
| download | infinitytier-0510f85a8fe6cba7e6258d534fa49d47f9f8e2a2.tar.gz infinitytier-0510f85a8fe6cba7e6258d534fa49d47f9f8e2a2.zip | |
Merge branch 'dev' into libpq
Diffstat (limited to 'node/Salsa20.cpp')
| -rw-r--r-- | node/Salsa20.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/Salsa20.cpp b/node/Salsa20.cpp index 1d4117e3..ca9e4718 100644 --- a/node/Salsa20.cpp +++ b/node/Salsa20.cpp @@ -14,7 +14,7 @@ #define XOR(v,w) ((v) ^ (w)) #define PLUS(v,w) ((uint32_t)((v) + (w))) -// Set up laod/store macros with appropriate endianness (we don't use these in SSE mode) +// Set up load/store macros with appropriate endianness (we don't use these in SSE mode) #ifndef ZT_SALSA20_SSE #if __BYTE_ORDER == __LITTLE_ENDIAN |