wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1018 from dgarske/fix_tfm_rusb_max

Browse Source 
Fix for fast math `fp_read_unsigned_bin` function to check max size
This commit is contained in:
toddouska
2017-07-13 09:27:02 -06:00
committed by GitHub
parent 43260f02f4 d559eb0f4f
commit 4491102eed
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wolfcrypt/src/tfm.c
View File

@@ -1868,9 +1868,22 @@ void fp_montgomery_reduce(fp_int *a, fp_int *m, fp_digit mp)
void fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c) void fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c)
{ {
#if defined(ALT_ECC_SIZE) || defined(HAVE_WOLF_BIGINT)
const word32 maxC = (a->size * sizeof(fp_digit));
#else
const word32 maxC = (FP_SIZE * sizeof(fp_digit));
#endif
/* zero the int */ /* zero the int */
fp_zero (a); fp_zero (a);
/* if input b excess max, then truncate */
if (c > 0 && (word32)c > maxC) {
int excess = (c - maxC);
c -= excess;
b += excess;
}
/* If we know the endianness of this architecture, and we're using /* If we know the endianness of this architecture, and we're using
32-bit fp_digits, we can optimize this */ 32-bit fp_digits, we can optimize this */
#if (defined(LITTLE_ENDIAN_ORDER) || defined(BIG_ENDIAN_ORDER)) && \ #if (defined(LITTLE_ENDIAN_ORDER) || defined(BIG_ENDIAN_ORDER)) && \
@@ -1882,11 +1895,6 @@ void fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c)
{ {
unsigned char *pd = (unsigned char *)a->dp; unsigned char *pd = (unsigned char *)a->dp;
if ((unsigned)c > (FP_SIZE * sizeof(fp_digit))) {
int excess = c - (FP_SIZE * sizeof(fp_digit));
c -= excess;
b += excess;
}
a->used = (c + sizeof(fp_digit) - 1)/sizeof(fp_digit); a->used = (c + sizeof(fp_digit) - 1)/sizeof(fp_digit);
/* read the bytes in */ /* read the bytes in */
#ifdef BIG_ENDIAN_ORDER #ifdef BIG_ENDIAN_ORDER
@@ -1913,7 +1921,10 @@ void fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c)
for (; c > 0; c--) { for (; c > 0; c--) {
fp_mul_2d (a, 8, a); fp_mul_2d (a, 8, a);
a->dp[0] |= *b++; a->dp[0] |= *b++;
a->used += 1;
if (a->used == 0) {
a->used = 1;
}
} }
#endif #endif
fp_clamp (a); fp_clamp (a);