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

rsa.c: Use xorbuf when possible

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2023-03-29 15:55:48 +02:00
parent e7ae64d9b5
commit 82e8eb2f70
1 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
wolfcrypt/src/rsa.c
View File

@@ -1143,7 +1143,6 @@ static int RsaPad_OAEP(const byte* input, word32 inputLen, byte* pkcsBlock,
int ret; int ret;
word32 hLen; word32 hLen;
int psLen; int psLen;
int i;
word32 idx; word32 idx;
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
@@ -1235,10 +1234,8 @@ static int RsaPad_OAEP(const byte* input, word32 inputLen, byte* pkcsBlock,
} }
XMEMCPY(pkcsBlock + (pkcsBlockLen - inputLen), input, inputLen); XMEMCPY(pkcsBlock + (pkcsBlockLen - inputLen), input, inputLen);
pkcsBlock[idx--] = 0x01; /* PS and M separator */ pkcsBlock[idx--] = 0x01; /* PS and M separator */
while (psLen > 0 && idx > 0) { XMEMSET(pkcsBlock + idx - psLen + 1, 0, psLen);
pkcsBlock[idx--] = 0x00; idx -= psLen;
psLen--;
}
idx = idx - hLen + 1; idx = idx - hLen + 1;
XMEMCPY(pkcsBlock + idx, lHash, hLen); XMEMCPY(pkcsBlock + idx, lHash, hLen);
@@ -1277,19 +1274,14 @@ static int RsaPad_OAEP(const byte* input, word32 inputLen, byte* pkcsBlock,
return ret; return ret;
} }
i = 0; xorbuf(pkcsBlock + hLen + 1, dbMask,pkcsBlockLen - hLen - 1);
idx = hLen + 1;
while (idx < pkcsBlockLen && (word32)i < (pkcsBlockLen - hLen -1)) {
pkcsBlock[idx] = dbMask[i++] ^ pkcsBlock[idx];
idx++;
}
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(dbMask, heap, DYNAMIC_TYPE_RSA); XFREE(dbMask, heap, DYNAMIC_TYPE_RSA);
#endif #endif
/* create maskedSeed from seedMask */ /* create maskedSeed from seedMask */
idx = 0; pkcsBlock[0] = 0x00;
pkcsBlock[idx++] = 0x00;
/* create seedMask inline */ /* create seedMask inline */
if ((ret = RsaMGF(mgf, pkcsBlock + hLen + 1, pkcsBlockLen - hLen - 1, if ((ret = RsaMGF(mgf, pkcsBlock + hLen + 1, pkcsBlockLen - hLen - 1,
pkcsBlock + 1, hLen, heap)) != 0) { pkcsBlock + 1, hLen, heap)) != 0) {
@@ -1301,11 +1293,7 @@ static int RsaPad_OAEP(const byte* input, word32 inputLen, byte* pkcsBlock,
} }
/* xor created seedMask with seed to make maskedSeed */ /* xor created seedMask with seed to make maskedSeed */
i = 0; xorbuf(pkcsBlock + 1, seed, hLen);
while (idx < (hLen + 1) && i < (int)hLen) {
pkcsBlock[idx] = pkcsBlock[idx] ^ seed[i++];
idx++;
}
#ifdef WOLFSSL_CHECK_MEM_ZERO #ifdef WOLFSSL_CHECK_MEM_ZERO
/* Seed must be zeroized now that it has been used. */ /* Seed must be zeroized now that it has been used. */
wc_MemZero_Add("Pad OAEP seed", seed, hLen); wc_MemZero_Add("Pad OAEP seed", seed, hLen);
@@ -1349,7 +1337,7 @@ static int RsaPad_PSS(const byte* input, word32 inputLen, byte* pkcsBlock,
int saltLen, int bits, void* heap) int saltLen, int bits, void* heap)
{ {
int ret = 0; int ret = 0;
int hLen, i, o, maskLen, hiBits; int hLen, o, maskLen, hiBits;
byte* m; byte* m;
byte* s; byte* s;
#if defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_STATIC_MEMORY) #if defined(WOLFSSL_NO_MALLOC) && !defined(WOLFSSL_STATIC_MEMORY)
@@ -1485,9 +1473,7 @@ static int RsaPad_PSS(const byte* input, word32 inputLen, byte* pkcsBlock,
m = pkcsBlock + maskLen - saltLen - 1; m = pkcsBlock + maskLen - saltLen - 1;
*(m++) ^= 0x01; *(m++) ^= 0x01;
for (i = 0; i < saltLen; i++) { xorbuf(m, salt + o, saltLen);
m[i] ^= salt[o + i];
}
} }
#if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_STATIC_MEMORY) #if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_STATIC_MEMORY)
@@ -1681,9 +1667,7 @@ static int RsaUnPad_OAEP(byte *pkcsBlock, unsigned int pkcsBlockLen,
} }
/* xor seedMask value with maskedSeed to get seed value */ /* xor seedMask value with maskedSeed to get seed value */
for (idx = 0; idx < (word32)hLen; idx++) { xorbuf(tmp, pkcsBlock + 1, hLen);
tmp[idx] = tmp[idx] ^ pkcsBlock[1 + idx];
}
/* get dbMask value */ /* get dbMask value */
if ((ret = RsaMGF(mgf, tmp, hLen, tmp + hLen, if ((ret = RsaMGF(mgf, tmp, hLen, tmp + hLen,
@@ -1698,9 +1682,7 @@ static int RsaUnPad_OAEP(byte *pkcsBlock, unsigned int pkcsBlockLen,
} }
/* get DB value by doing maskedDB xor dbMask */ /* get DB value by doing maskedDB xor dbMask */
for (idx = 0; idx < (pkcsBlockLen - hLen - 1); idx++) { xorbuf(pkcsBlock + hLen + 1, tmp + hLen, pkcsBlockLen - hLen - 1);
pkcsBlock[hLen + 1 + idx] = pkcsBlock[hLen + 1 + idx] ^ tmp[idx + hLen];
}
ForceZero(tmp, pkcsBlockLen); ForceZero(tmp, pkcsBlockLen);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
@@ -1873,8 +1855,7 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,
return PSS_SALTLEN_E; return PSS_SALTLEN_E;
} }
} }
for (i++; i < maskLen; i++) xorbuf(pkcsBlock + i, tmp + i, maskLen - i);
pkcsBlock[i] ^= tmp[i];
#if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_STATIC_MEMORY) #if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_STATIC_MEMORY)
XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER); XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);