feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

xorbuf: fix alignment when possible

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2023-03-29 16:08:36 +02:00
parent 82e8eb2f70
commit 6079b92e26
1 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
wolfcrypt/src/misc.c
View File

@@ -262,7 +262,7 @@ WC_MISC_STATIC WC_INLINE void XorWordsOut(wolfssl_word** r,
word32 i; word32 i;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
*(*r)++ = *(*a)++ ^ *(*b)++; *((*r)++) = *((*a)++) ^ *((*b)++);
} }
/* This routine performs a bitwise XOR operation of <*buf> and <*mask> of n /* This routine performs a bitwise XOR operation of <*buf> and <*mask> of n
@@ -276,17 +276,27 @@ WC_MISC_STATIC WC_INLINE void xorbufout(void* out, const void* buf,
byte* b; byte* b;
const byte* m; const byte* m;
if (((wc_ptr_t)buf | (wc_ptr_t)mask) % WOLFSSL_WORD_SIZE == 0) {
/* Alignment checks out. Possible to XOR words. */
XorWordsOut( (wolfssl_word**)&out, (const wolfssl_word**)&buf,
(const wolfssl_word**)&mask, count / WOLFSSL_WORD_SIZE);
count %= WOLFSSL_WORD_SIZE;
}
o = (byte*)out; o = (byte*)out;
b = (byte*)buf; b = (byte*)buf;
m = (const byte*)mask; m = (const byte*)mask;
if (((wc_ptr_t)o) % WOLFSSL_WORD_SIZE ==
((wc_ptr_t)b) % WOLFSSL_WORD_SIZE &&
((wc_ptr_t)b) % WOLFSSL_WORD_SIZE ==
((wc_ptr_t)m) % WOLFSSL_WORD_SIZE) {
/* Alignment checks out. Possible to XOR words. */
/* Move alignment so that it lines up with a
* WOLFSSL_WORD_SIZE boundary */
while (((wc_ptr_t)b) % WOLFSSL_WORD_SIZE != 0 && count > 0) {
*(o++) = *(b++) ^ *(m++);
count--;
}
XorWordsOut( (wolfssl_word**)&o, (const wolfssl_word**)&b,
(const wolfssl_word**)&m, count / WOLFSSL_WORD_SIZE);
count %= WOLFSSL_WORD_SIZE;
}
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
o[i] = b[i] ^ m[i]; o[i] = b[i] ^ m[i];
} }
@@ -299,7 +309,7 @@ WC_MISC_STATIC WC_INLINE void XorWords(wolfssl_word** r, const wolfssl_word** a,
word32 i; word32 i;
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
*(*r)++ ^= *(*a)++; *((*r)++) ^= *((*a)++);
} }
/* This routine performs a bitwise XOR operation of <*buf> and <*mask> of n /* This routine performs a bitwise XOR operation of <*buf> and <*mask> of n
@@ -311,16 +321,23 @@ WC_MISC_STATIC WC_INLINE void xorbuf(void* buf, const void* mask, word32 count)
byte* b; byte* b;
const byte* m; const byte* m;
if (((wc_ptr_t)buf | (wc_ptr_t)mask) % WOLFSSL_WORD_SIZE == 0) {
/* Alignment checks out. Possible to XOR words. */
XorWords( (wolfssl_word**)&buf,
(const wolfssl_word**)&mask, count / WOLFSSL_WORD_SIZE);
count %= WOLFSSL_WORD_SIZE;
}
b = (byte*)buf; b = (byte*)buf;
m = (const byte*)mask; m = (const byte*)mask;
if (((wc_ptr_t)b) % WOLFSSL_WORD_SIZE ==
((wc_ptr_t)m) % WOLFSSL_WORD_SIZE) {
/* Alignment checks out. Possible to XOR words. */
/* Move alignment so that it lines up with a
* WOLFSSL_WORD_SIZE boundary */
while (((wc_ptr_t)buf) % WOLFSSL_WORD_SIZE != 0 && count > 0) {
*(b++) ^= *(m++);
count--;
}
XorWords( (wolfssl_word**)&b,
(const wolfssl_word**)&m, count / WOLFSSL_WORD_SIZE);
count %= WOLFSSL_WORD_SIZE;
}
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
b[i] ^= m[i]; b[i] ^= m[i];
} }