mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wolfcrypt/src/pwdbased.c: refactor copy in scryptSalsa() as a memcpy(), for efficiency and to work around a bug in clang-17; also fix scratch buffer x in scryptBlockMix() to have correct alignment.

Browse Source
This commit is contained in:
Daniel Pouzzner 2023-02-08 21:31:56 -06:00
parent 63fdc4e843
commit 9dd23fca25
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wolfcrypt/src/pwdbased.c
View File

@ -581,8 +581,7 @@ static void scryptSalsa(word32* out, word32* in)
word32 x[16]; word32 x[16];
#ifdef LITTLE_ENDIAN_ORDER #ifdef LITTLE_ENDIAN_ORDER
for (i = 0; i < 16; ++i) XMEMCPY(x, in, sizeof(x));
x[i] = in[i];
#else #else
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
x[i] = ByteReverseWord32(in[i]); x[i] = ByteReverseWord32(in[i]);
@ -623,15 +622,14 @@ static void scryptSalsa(word32* out, word32* in)
*/ */
static void scryptBlockMix(byte* b, byte* y, int r) static void scryptBlockMix(byte* b, byte* y, int r)
{ {
byte x[64];
#ifdef WORD64_AVAILABLE #ifdef WORD64_AVAILABLE
word64 x[8];
word64* b64 = (word64*)b; word64* b64 = (word64*)b;
word64* y64 = (word64*)y; word64* y64 = (word64*)y;
word64* x64 = (word64*)x;
#else #else
word32 x[16];
word32* b32 = (word32*)b; word32* b32 = (word32*)b;
word32* y32 = (word32*)y; word32* y32 = (word32*)y;
word32* x32 = (word32*)x;
#endif #endif
int i; int i;
int j; int j;
@ -643,10 +641,11 @@ static void scryptBlockMix(byte* b, byte* y, int r)
{ {
#ifdef WORD64_AVAILABLE #ifdef WORD64_AVAILABLE
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
x64[j] ^= b64[i * 8 + j]; x[j] ^= b64[i * 8 + j];
#else #else
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
x32[j] ^= b32[i * 16 + j]; x[j] ^= b32[i * 16 + j];
#endif #endif
scryptSalsa((word32*)x, (word32*)x); scryptSalsa((word32*)x, (word32*)x);
XMEMCPY(y + i * 64, x, sizeof(x)); XMEMCPY(y + i * 64, x, sizeof(x));