arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop use of static in unnamed namespace

pull/795/head
Jeffrey Walton 2019-01-23 06:15:51 -05:00
parent 3d07010ac8
commit 1cd8ccbf82
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scrypt.cpp
View File

@ -41,28 +41,35 @@ using CryptoPP::rotlConstant;
using CryptoPP::LITTLE_ENDIAN_ORDER; using CryptoPP::LITTLE_ENDIAN_ORDER;
using CryptoPP::AlignedSecByteBlock; using CryptoPP::AlignedSecByteBlock;
static inline void LE32ENC(byte* out, word32 in) inline void LE32ENC(byte* out, word32 in)
{ {
PutWord(false, LITTLE_ENDIAN_ORDER, out, in); PutWord(false, LITTLE_ENDIAN_ORDER, out, in);
} }
static inline word32 LE32DEC(const byte* in) inline word32 LE32DEC(const byte* in)
{ {
return GetWord<word32>(false, LITTLE_ENDIAN_ORDER, in); return GetWord<word32>(false, LITTLE_ENDIAN_ORDER, in);
} }
static inline word64 LE64DEC(const byte* in) inline word64 LE64DEC(const byte* in)
{ {
return GetWord<word64>(false, LITTLE_ENDIAN_ORDER, in); return GetWord<word64>(false, LITTLE_ENDIAN_ORDER, in);
} }
static inline void BlockCopy(byte* dest, byte* src, size_t len) inline void BlockCopy(byte* dest, byte* src, size_t len)
{ {
// OpenMP 4.0 released July 2013.
#if _OPENMP >= 201307
#pragma omp simd
for (size_t i = 0; i < len; ++i) for (size_t i = 0; i < len; ++i)
dest[i] = src[i]; dest[i] = src[i];
#else
for (size_t i = 0; i < len; ++i)
dest[i] = src[i];
#endif
} }
static inline void BlockXOR(byte* dest, byte* src, size_t len) inline void BlockXOR(byte* dest, byte* src, size_t len)
{ {
// OpenMP 4.0 released July 2013. // OpenMP 4.0 released July 2013.
#if _OPENMP >= 201307 #if _OPENMP >= 201307
@ -75,7 +82,7 @@ static inline void BlockXOR(byte* dest, byte* src, size_t len)
#endif #endif
} }
static inline void PBKDF2_SHA256(byte* buf, size_t dkLen, inline void PBKDF2_SHA256(byte* buf, size_t dkLen,
const byte* passwd, size_t passwdlen, const byte* passwd, size_t passwdlen,
const byte* salt, size_t saltlen, byte count) const byte* salt, size_t saltlen, byte count)
{ {
@ -86,7 +93,7 @@ static inline void PBKDF2_SHA256(byte* buf, size_t dkLen,
pbkdf.DeriveKey(buf, dkLen, 0, passwd, passwdlen, salt, saltlen, count, 0.0f); pbkdf.DeriveKey(buf, dkLen, 0, passwd, passwdlen, salt, saltlen, count, 0.0f);
} }
static inline void Salsa20_8(byte B[64]) inline void Salsa20_8(byte B[64])
{ {
word32 B32[16]; word32 B32[16];
@ -99,7 +106,7 @@ static inline void Salsa20_8(byte B[64])
LE32ENC(&B[4 * i], B32[i]); LE32ENC(&B[4 * i], B32[i]);
} }
static inline void BlockMix(byte* B, byte* Y, size_t r) inline void BlockMix(byte* B, byte* Y, size_t r)
{ {
byte X[64]; byte X[64];
@ -125,13 +132,13 @@ static inline void BlockMix(byte* B, byte* Y, size_t r)
BlockCopy(&B[(i + r) * 64], &Y[(i * 2 + 1) * 64], 64); BlockCopy(&B[(i + r) * 64], &Y[(i * 2 + 1) * 64], 64);
} }
static inline word64 Integerify(byte* B, size_t r) inline word64 Integerify(byte* B, size_t r)
{ {
byte* X = &B[(2 * r - 1) * 64]; byte* X = &B[(2 * r - 1) * 64];
return LE64DEC(X); return LE64DEC(X);
} }
static inline void Smix(byte* B, size_t r, word64 N, byte* V, byte* XY) inline void Smix(byte* B, size_t r, word64 N, byte* V, byte* XY)
{ {
byte* X = XY; byte* X = XY;
byte* Y = XY+128*r; byte* Y = XY+128*r;