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

Rework

Browse Source
This commit is contained in:
Sean Parkinson
2022-07-27 12:02:15 +10:00
parent 9c480ece66
commit 01aad13c38
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/internal.c
View File

@@ -4626,10 +4626,8 @@ int VerifyRsaSign(WOLFSSL* ssl, byte* verifySig, word32 sigSz,
int RsaDec(WOLFSSL* ssl, byte* in, word32 inSz, byte** out, word32* outSz, int RsaDec(WOLFSSL* ssl, byte* in, word32 inSz, byte** out, word32* outSz,
RsaKey* key, DerBuffer* keyBufInfo) RsaKey* key, DerBuffer* keyBufInfo)
{ {
word32 outSzTmp;
byte *outTmp; byte *outTmp;
byte mask; byte mask;
int zero;
int ret; int ret;
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
const byte* keyBuf = NULL; const byte* keyBuf = NULL;
@@ -4678,12 +4676,10 @@ int RsaDec(WOLFSSL* ssl, byte* in, word32 inSz, byte** out, word32* outSz,
#endif /* WOLFSSL_ASYNC_CRYPT */ #endif /* WOLFSSL_ASYNC_CRYPT */
mask = ctMaskGT(ret, 0); mask = ctMaskGT(ret, 0);
*outSz = 0; *outSz = (word32)(ret & (int)(sword8)mask);
zero = 0; ret &= (int)(sword8)(~mask);
outSzTmp = (word32)ret; /* Copy pointer */
ctMaskCopy(mask, (byte*)outSz, (byte*)&outSzTmp, (byte*)outSz, sizeof(*outSz)); ctMaskCopy(mask, (byte*)out, (byte*)&outTmp, sizeof(*out));
ctMaskCopy(mask, (byte*)&ret, (byte*)&zero, (byte*)&ret, sizeof(ret));
ctMaskCopy(mask, (byte*)out, (byte*)&outTmp, (byte*)out, sizeof(*out));
WOLFSSL_LEAVE("RsaDec", ret); WOLFSSL_LEAVE("RsaDec", ret);
@@ -34762,7 +34758,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
ret = args->lastErr; ret = args->lastErr;
args->lastErr = 0; /* reset */ args->lastErr = 0; /* reset */
/* On error 'ret' will be negative - top bit set */ /* On error 'ret' will be negative */
mask = ((unsigned int)ret >> mask = ((unsigned int)ret >>
((sizeof(ret) * 8) - 1)) - 1; ((sizeof(ret) * 8) - 1)) - 1;
@@ -34771,8 +34767,8 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
ssl->arrays->preMasterSecret[1] = ssl->chVersion.minor; ssl->arrays->preMasterSecret[1] = ssl->chVersion.minor;
tmpRsa = input + args->idx - VERSION_SZ - SECRET_LEN; tmpRsa = input + args->idx - VERSION_SZ - SECRET_LEN;
ctMaskCopy(mask, (byte*)&args->output, ctMaskCopy(~mask, (byte*)&args->output, (byte*)&tmpRsa,
(byte*)&args->output, (byte*)&tmpRsa, sizeof(args->output)); sizeof(args->output));
if (args->output != NULL) { if (args->output != NULL) {
/* Use random secret on error */ /* Use random secret on error */
for (i = VERSION_SZ; i < SECRET_LEN; i++) { for (i = VERSION_SZ; i < SECRET_LEN; i++) {

11
wolfcrypt/src/misc.c
View File

@@ -545,14 +545,15 @@ WC_STATIC WC_INLINE byte ctSetLTE(int a, int b)
return (byte)(((word32)a - b - 1) >> 31); return (byte)(((word32)a - b - 1) >> 31);
} }
/* Constant time - copy size bytes from left to dst if mask is set, size bytes /* Constant time - conditionally copy size bytes from src to dst if mask is set
* from right to dst if mask is not set */ */
WC_STATIC WC_INLINE void ctMaskCopy(byte m, byte* dst, byte* left, byte* right, WC_STATIC WC_INLINE void ctMaskCopy(byte mask, byte* dst, byte* src,
word16 size) word16 size)
{ {
int i; int i;
for (i = 0; i < size; ++i) for (i = 0; i < size; ++i) {
dst[i] = ctMaskSel(m, left[i], right[i]); dst[i] ^= (dst[i] ^ src[i]) & mask;
}
} }
#endif #endif

3
wolfssl/wolfcrypt/misc.h
View File

@@ -126,8 +126,7 @@ WOLFSSL_LOCAL byte ctMaskNotEq(int a, int b);
WOLFSSL_LOCAL byte ctMaskSel(byte m, byte a, byte b); WOLFSSL_LOCAL byte ctMaskSel(byte m, byte a, byte b);
WOLFSSL_LOCAL int ctMaskSelInt(byte m, int a, int b); WOLFSSL_LOCAL int ctMaskSelInt(byte m, int a, int b);
WOLFSSL_LOCAL byte ctSetLTE(int a, int b); WOLFSSL_LOCAL byte ctSetLTE(int a, int b);
WOLFSSL_LOCAL void ctMaskCopy(byte m, byte* dst, byte* left, byte* right, WOLFSSL_LOCAL void ctMaskCopy(byte mask, byte* dst, byte* src, word16 size);
word16 size);
#endif /* NO_INLINE */ #endif /* NO_INLINE */