Skip to content

Commit f9b666d

Browse files
embhornembhorn
authored
Merge pull request #9298 from douzzer/20251014-WC_SAFE_SUM
20251014-WC_SAFE_SUM
2 parents 53bbf7f + c771167 commit f9b666d

5 files changed

Lines changed: 109 additions & 24 deletions

File tree

‎src/internal.c‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10613,8 +10613,11 @@ static void AddHandShakeHeader(byte* output, word32 length,
1061310613
if (hs == NULL)
1061410614
return;
1061510615

10616+
PRAGMA_GCC_DIAG_PUSH;
10617+
PRAGMA_GCC("GCC diagnostic ignored \"-Wnull-dereference\"");
1061610618
hs->type = type;
1061710619
c32to24(length, hs->length); /* type and length same for each */
10620+
PRAGMA_GCC_DIAG_POP;
1061810621
#ifdef WOLFSSL_DTLS
1061910622
if (ssl->options.dtls) {
1062010623
DtlsHandShakeHeader* dtls;
@@ -14705,7 +14708,10 @@ int LoadCertByIssuer(WOLFSSL_X509_STORE* store, X509_NAME* issuer, int type)
1470514708
if (idx >= 0) {
1470614709
WOLFSSL_MSG("find hashed CRL in list");
1470714710
ph = wolfSSL_sk_BY_DIR_HASH_value(entry->hashes, idx);
14708-
suffix = ph->last_suffix;
14711+
if (ph)
14712+
suffix = ph->last_suffix;
14713+
else
14714+
suffix = 0;
1470914715
} else {
1471014716
ph = NULL;
1471114717
suffix = 0;
@@ -23309,6 +23315,8 @@ int SendChangeCipher(WOLFSSL* ssl)
2330923315

2331023316
/* get output buffer */
2331123317
output = GetOutputBuffer(ssl);
23318+
if (output == NULL)
23319+
return BUFFER_E;
2331223320

2331323321
AddRecordHeader(output, 1, change_cipher_spec, ssl, CUR_ORDER);
2331423322

‎src/ssl.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11549,15 +11549,17 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
1154911549
#endif
1155011550
byte* myBuffer = staticBuffer;
1155111551
int dynamic = 0;
11552-
word32 sending = 0;
11553-
int idx = 0;
11552+
size_t sending = 0;
11553+
size_t idx = 0;
1155411554
int i;
1155511555
int ret;
1155611556

1155711557
WOLFSSL_ENTER("wolfSSL_writev");
1155811558

1155911559
for (i = 0; i < iovcnt; i++)
11560-
sending += iov[i].iov_len;
11560+
if (! WC_SAFE_SUM_UNSIGNED(size_t, sending, iov[i].iov_len,
11561+
sending))
11562+
return BUFFER_E;
1156111563

1156211564
if (sending > sizeof(staticBuffer)) {
1156311565
myBuffer = (byte*)XMALLOC(sending, ssl->heap,

‎wolfcrypt/src/aes.c‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13706,8 +13706,12 @@ static int AesXtsEncryptUpdate(XtsAes* xaes, byte* out, const byte* in, word32 s
1370613706
}
1370713707

1370813708
#ifndef WC_AESXTS_STREAM_NO_REQUEST_ACCOUNTING
13709-
(void)WC_SAFE_SUM_WORD32(stream->bytes_crypted_with_this_tweak, sz,
13710-
stream->bytes_crypted_with_this_tweak);
13709+
if (! WC_SAFE_SUM_WORD32(stream->bytes_crypted_with_this_tweak, sz,
13710+
stream->bytes_crypted_with_this_tweak))
13711+
{
13712+
WOLFSSL_MSG("Overflow of stream->bytes_crypted_with_this_tweak "
13713+
"in AesXtsEncryptUpdate().");
13714+
}
1371113715
#endif
1371213716
#if FIPS_VERSION3_GE(6,0,0)
1371313717
/* SP800-38E - Restrict data unit to 2^20 blocks per key. A block is
@@ -14144,15 +14148,20 @@ static int AesXtsDecryptUpdate(XtsAes* xaes, byte* out, const byte* in, word32 s
1414414148
return BAD_FUNC_ARG;
1414514149
}
1414614150

14147-
if (stream->bytes_crypted_with_this_tweak & ((word32)WC_AES_BLOCK_SIZE - 1U))
14151+
if (stream->bytes_crypted_with_this_tweak &
14152+
((word32)WC_AES_BLOCK_SIZE - 1U))
1414814153
{
14149-
WOLFSSL_MSG("Call to AesXtsDecryptUpdate after previous finalizing call");
14154+
WOLFSSL_MSG("AesXtsDecryptUpdate after previous finalizing call");
1415014155
return BAD_FUNC_ARG;
1415114156
}
1415214157

1415314158
#ifndef WC_AESXTS_STREAM_NO_REQUEST_ACCOUNTING
14154-
(void)WC_SAFE_SUM_WORD32(stream->bytes_crypted_with_this_tweak, sz,
14155-
stream->bytes_crypted_with_this_tweak);
14159+
if (! WC_SAFE_SUM_WORD32(stream->bytes_crypted_with_this_tweak, sz,
14160+
stream->bytes_crypted_with_this_tweak))
14161+
{
14162+
WOLFSSL_MSG("Overflow of stream->bytes_crypted_with_this_tweak "
14163+
"in AesXtsDecryptUpdate().");
14164+
}
1415614165
#endif
1415714166

1415814167
{

‎wolfcrypt/src/asn.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29915,19 +29915,18 @@ static int EncodeName(EncodedName* name, const char* nameStr,
2991529915
ret = BAD_FUNC_ARG;
2991629916
}
2991729917

29918-
#ifdef WOLFSSL_CUSTOM_OID
29919-
if (ret == 0 && type == ASN_CUSTOM_NAME) {
29920-
if (cname == NULL || cname->custom.oidSz == 0) {
29921-
name->used = 0;
29922-
return 0;
29923-
}
29924-
}
29925-
#else
29926-
(void)cname;
29927-
#endif
29928-
29929-
CALLOC_ASNSETDATA(dataASN, rdnASN_Length, ret, NULL);
2993029918
if (ret == 0) {
29919+
#ifdef WOLFSSL_CUSTOM_OID
29920+
if (type == ASN_CUSTOM_NAME) {
29921+
if (cname == NULL || cname->custom.oidSz == 0) {
29922+
name->used = 0;
29923+
return 0;
29924+
}
29925+
}
29926+
#else
29927+
(void)cname;
29928+
#endif
29929+
CALLOC_ASNSETDATA(dataASN, rdnASN_Length, ret, NULL);
2993129930
nameSz = (word32)XSTRLEN(nameStr);
2993229931
/* Copy the RDN encoding template. ASN.1 tag for the name string is set
2993329932
* based on type. */

‎wolfssl/wolfcrypt/types.h‎

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,75 @@ enum {
462462

463463
#define XELEM_CNT(x) (sizeof((x))/sizeof(*(x)))
464464

465-
#define WC_SAFE_SUM_WORD32(in1, in2, out) ((in2) <= 0xffffffffU - (in1) ? \
466-
((out) = (in1) + (in2), 1) : ((out) = 0xffffffffU, 0))
465+
#ifdef NO_INLINE
466+
#define WC_WUR_INT(x) (x)
467+
#else
468+
static WC_INLINE WARN_UNUSED_RESULT int WC_WUR_INT(int x) { return x; }
469+
#endif
470+
471+
#ifdef WORD64_AVAILABLE
472+
#define WC_MAX_UINT_OF(x) \
473+
((((word64)1 << ((sizeof(x) * (word64)CHAR_BIT) - \
474+
(word64)1)) - (word64)1) \
475+
| \
476+
((word64)1 << ((sizeof(x) * (word64)CHAR_BIT) - (word64)1)))
477+
#define WC_MAX_SINT_OF(x) \
478+
((sword64)((((word64)1 << ((sizeof(x) * (word64)CHAR_BIT) - \
479+
(word64)2)) - (word64)1) \
480+
| \
481+
((word64)1 << ((sizeof(x) * (word64)CHAR_BIT) - \
482+
(word64)2))))
483+
#define WC_MIN_SINT_OF(x) \
484+
((sword64)((word64)1 << ((sizeof(x) * (word64)CHAR_BIT) - \
485+
(word64)1)))
486+
#else
487+
#define WC_MAX_UINT_OF(x) \
488+
((((word32)1 << ((sizeof(x) * (word32)CHAR_BIT) - \
489+
(word32)1)) - (word32)1) \
490+
| \
491+
((word32)1 << ((sizeof(x) * (word32)CHAR_BIT) - (word32)1)))
492+
#define WC_MAX_SINT_OF(x) \
493+
((sword32)((((word32)1 << ((sizeof(x) * (word32)CHAR_BIT) - \
494+
(word32)2)) - (word32)1) \
495+
| \
496+
((word32)1 << ((sizeof(x) * (word32)CHAR_BIT) - \
497+
(word32)2))))
498+
#define WC_MIN_SINT_OF(x) \
499+
((sword32)((word32)1 << ((sizeof(x) * (word32)CHAR_BIT) - \
500+
(word32)1)))
501+
#endif
502+
503+
#define WC_SAFE_SUM_UNSIGNED_NO_WUR(type, in1, in2, out) \
504+
((in2) <= (WC_MAX_UINT_OF(type) - (in1)) ? \
505+
((out) = (in1) + (in2), 1) : \
506+
((out) = WC_MAX_UINT_OF(type), 0))
507+
508+
#define WC_SAFE_SUM_UNSIGNED(type, in1, in2, out) \
509+
WC_WUR_INT(WC_SAFE_SUM_UNSIGNED_NO_WUR(type, in1, in2, out))
510+
511+
#if defined(HAVE_SELFTEST) || (defined(HAVE_FIPS) && FIPS_VERSION3_LE(6,0,0))
512+
#define WC_SAFE_SUM_WORD32(in1, in2, out) \
513+
WC_SAFE_SUM_UNSIGNED_NO_WUR(word32, in1, in2, out)
514+
#else
515+
#define WC_SAFE_SUM_WORD32(in1, in2, out) \
516+
WC_SAFE_SUM_UNSIGNED(word32, in1, in2, out)
517+
#endif
518+
519+
#define WC_SAFE_SUM_SIGNED_NO_WUR(type, in1, in2, out) \
520+
((((in1) > 0) && ((in2) > 0)) ? \
521+
((in2) <= WC_MAX_SINT_OF(type) - (in1) ? \
522+
((out) = (in1) + (in2), 1) : \
523+
((out) = (type)WC_MAX_SINT_OF(type), 0)) \
524+
: \
525+
((((in1) < 0) && ((in2) < 0)) ? \
526+
((in2) >= WC_MIN_SINT_OF(type) - (in1) ? \
527+
((out) = (in1) + (in2), 1) : \
528+
((out) = (type)WC_MIN_SINT_OF(type), 0)) \
529+
: \
530+
((out) = (in1) + (in2), 1)))
531+
532+
#define WC_SAFE_SUM_SIGNED(type, in1, in2, out) \
533+
WC_WUR_INT(WC_SAFE_SUM_SIGNED_NO_WUR(type, in1, in2, out))
467534

468535
#if defined(HAVE_IO_POOL)
469536
WOLFSSL_API void* XMALLOC(size_t n, void* heap, int type);

0 commit comments

Comments
 (0)