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

fix wolfSSL_read_ex() prototype with size_t sz, not int sz, for consistency with OpenSSL;

Browse Source 
fix internal functions wolfSSL_read_internal() and ReceiveData() to likewise accept size_t sz;

add negative sz checks where needed to other functions that call wolfSSL_read_internal() and ReceiveData();

add min_size_t() and max_size_t() to misc.c/misc.h.
This commit is contained in:
Daniel Pouzzner
2025-01-24 16:16:43 -06:00
parent 93ac482772
commit 1b338abb2d
7 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@@ -25686,7 +25686,7 @@ int SendData(WOLFSSL* ssl, const void* data, int sz)
} }
/* process input data */ /* process input data */
int ReceiveData(WOLFSSL* ssl, byte* output, int sz, int peek) int ReceiveData(WOLFSSL* ssl, byte* output, size_t sz, int peek)
{ {
int size; int size;
int error = ssl->error; int error = ssl->error;
@@ -25842,7 +25842,7 @@ startScr:
#endif #endif
} }
size = (int)min((word32)sz, ssl->buffers.clearOutputBuffer.length); size = (int)min_size_t(sz, (size_t)ssl->buffers.clearOutputBuffer.length);
XMEMCPY(output, ssl->buffers.clearOutputBuffer.buffer, size); XMEMCPY(output, ssl->buffers.clearOutputBuffer.buffer, size);

34
src/ssl.c
View File

@@ -3110,13 +3110,13 @@ int wolfSSL_write_ex(WOLFSSL* ssl, const void* data, int sz, size_t* wr)
} }
static int wolfSSL_read_internal(WOLFSSL* ssl, void* data, int sz, int peek) static int wolfSSL_read_internal(WOLFSSL* ssl, void* data, size_t sz, int peek)
{ {
int ret; int ret;
WOLFSSL_ENTER("wolfSSL_read_internal"); WOLFSSL_ENTER("wolfSSL_read_internal");
if (ssl == NULL || data == NULL || sz < 0) if (ssl == NULL || data == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef WOLFSSL_QUIC #ifdef WOLFSSL_QUIC
@@ -3194,7 +3194,10 @@ int wolfSSL_peek(WOLFSSL* ssl, void* data, int sz)
{ {
WOLFSSL_ENTER("wolfSSL_peek"); WOLFSSL_ENTER("wolfSSL_peek");
return wolfSSL_read_internal(ssl, data, sz, TRUE); if (sz < 0)
return BAD_FUNC_ARG;
return wolfSSL_read_internal(ssl, data, (size_t)sz, TRUE);
} }
@@ -3203,6 +3206,9 @@ int wolfSSL_read(WOLFSSL* ssl, void* data, int sz)
{ {
WOLFSSL_ENTER("wolfSSL_read"); WOLFSSL_ENTER("wolfSSL_read");
if (sz < 0)
return BAD_FUNC_ARG;
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
if (ssl == NULL) { if (ssl == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@@ -3212,16 +3218,26 @@ int wolfSSL_read(WOLFSSL* ssl, void* data, int sz)
ssl->cbmode = WOLFSSL_CB_READ; ssl->cbmode = WOLFSSL_CB_READ;
} }
#endif #endif
return wolfSSL_read_internal(ssl, data, sz, FALSE); return wolfSSL_read_internal(ssl, data, (size_t)sz, FALSE);
} }
/* returns 0 on failure and on no read */ /* returns 0 on failure and on no read */
int wolfSSL_read_ex(WOLFSSL* ssl, void* data, int sz, size_t* rd) int wolfSSL_read_ex(WOLFSSL* ssl, void* data, size_t sz, size_t* rd)
{ {
int ret; int ret;
#ifdef OPENSSL_EXTRA
if (ssl == NULL) {
return BAD_FUNC_ARG;
}
if (ssl->CBIS != NULL) {
ssl->CBIS(ssl, WOLFSSL_CB_READ, WOLFSSL_SUCCESS);
ssl->cbmode = WOLFSSL_CB_READ;
}
#endif
ret = wolfSSL_read_internal(ssl, data, sz, FALSE);
ret = wolfSSL_read(ssl, data, sz);
if (ret > 0 && rd != NULL) { if (ret > 0 && rd != NULL) {
*rd = (size_t)ret; *rd = (size_t)ret;
} }
@@ -3238,10 +3254,10 @@ int wolfSSL_mcast_read(WOLFSSL* ssl, word16* id, void* data, int sz)
WOLFSSL_ENTER("wolfSSL_mcast_read"); WOLFSSL_ENTER("wolfSSL_mcast_read");
if (ssl == NULL) if ((ssl == NULL) || (sz < 0))
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
ret = wolfSSL_read_internal(ssl, data, sz, FALSE); ret = wolfSSL_read_internal(ssl, data, (size_t)sz, FALSE);
if (ssl->options.dtls && ssl->options.haveMcast && id != NULL) if (ssl->options.dtls && ssl->options.haveMcast && id != NULL)
*id = ssl->keys.curPeerId; *id = ssl->keys.curPeerId;
return ret; return ret;

2
src/tls13.c
View File

@@ -14887,7 +14887,7 @@ int wolfSSL_read_early_data(WOLFSSL* ssl, void* data, int sz, int* outSz)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
if (ssl->options.handShakeState == SERVER_FINISHED_COMPLETE) { if (ssl->options.handShakeState == SERVER_FINISHED_COMPLETE) {
ret = ReceiveData(ssl, (byte*)data, sz, FALSE); ret = ReceiveData(ssl, (byte*)data, (size_t)sz, FALSE);
if (ret > 0) if (ret > 0)
*outSz = ret; *outSz = ret;
if (ssl->error == WC_NO_ERR_TRACE(ZERO_RETURN)) { if (ssl->error == WC_NO_ERR_TRACE(ZERO_RETURN)) {

10
wolfcrypt/src/misc.c
View File

@@ -519,6 +519,11 @@ WC_MISC_STATIC WC_INLINE int ConstantCompare(const byte* a, const byte* b,
} }
#endif /* !WOLFSSL_HAVE_MIN */ #endif /* !WOLFSSL_HAVE_MIN */
WC_MISC_STATIC WC_INLINE size_t min_size_t(size_t a, size_t b)
{
return a > b ? b : a;
}
#ifndef WOLFSSL_HAVE_MAX #ifndef WOLFSSL_HAVE_MAX
#define WOLFSSL_HAVE_MAX #define WOLFSSL_HAVE_MAX
#if defined(HAVE_FIPS) && !defined(max) /* so ifdef check passes */ #if defined(HAVE_FIPS) && !defined(max) /* so ifdef check passes */
@@ -530,6 +535,11 @@ WC_MISC_STATIC WC_INLINE int ConstantCompare(const byte* a, const byte* b,
} }
#endif /* !WOLFSSL_HAVE_MAX */ #endif /* !WOLFSSL_HAVE_MAX */
WC_MISC_STATIC WC_INLINE size_t max_size_t_(size_t a, size_t b)
{
return a > b ? a : b;
}
#ifndef WOLFSSL_NO_INT_ENCODE #ifndef WOLFSSL_NO_INT_ENCODE
/* converts a 32 bit integer to 24 bit */ /* converts a 32 bit integer to 24 bit */
WC_MISC_STATIC WC_INLINE void c32to24(word32 in, word24 out) WC_MISC_STATIC WC_INLINE void c32to24(word32 in, word24 out)

2
wolfssl/internal.h
View File

@@ -6521,7 +6521,7 @@ WOLFSSL_LOCAL int SendHelloRequest(WOLFSSL* ssl);
WOLFSSL_LOCAL int SendCertificateStatus(WOLFSSL* ssl); WOLFSSL_LOCAL int SendCertificateStatus(WOLFSSL* ssl);
WOLFSSL_LOCAL int SendServerKeyExchange(WOLFSSL* ssl); WOLFSSL_LOCAL int SendServerKeyExchange(WOLFSSL* ssl);
WOLFSSL_LOCAL int SendBuffered(WOLFSSL* ssl); WOLFSSL_LOCAL int SendBuffered(WOLFSSL* ssl);
WOLFSSL_LOCAL int ReceiveData(WOLFSSL* ssl, byte* output, int sz, int peek); WOLFSSL_LOCAL int ReceiveData(WOLFSSL* ssl, byte* output, size_t sz, int peek);
WOLFSSL_LOCAL int SendFinished(WOLFSSL* ssl); WOLFSSL_LOCAL int SendFinished(WOLFSSL* ssl);
WOLFSSL_LOCAL int RetrySendAlert(WOLFSSL* ssl); WOLFSSL_LOCAL int RetrySendAlert(WOLFSSL* ssl);
WOLFSSL_LOCAL int SendAlert(WOLFSSL* ssl, int severity, int type); WOLFSSL_LOCAL int SendAlert(WOLFSSL* ssl, int severity, int type);

2
wolfssl/ssl.h
View File

@@ -1368,7 +1368,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfSSL_write(
WOLFSSL_API int wolfSSL_write_ex(WOLFSSL* ssl, const void* data, int sz, WOLFSSL_API int wolfSSL_write_ex(WOLFSSL* ssl, const void* data, int sz,
size_t* wr); size_t* wr);
WOLFSSL_ABI WOLFSSL_API int wolfSSL_read(WOLFSSL* ssl, void* data, int sz); WOLFSSL_ABI WOLFSSL_API int wolfSSL_read(WOLFSSL* ssl, void* data, int sz);
WOLFSSL_API int wolfSSL_read_ex(WOLFSSL* ssl, void* data, int sz, size_t* rd); WOLFSSL_API int wolfSSL_read_ex(WOLFSSL* ssl, void* data, size_t sz, size_t* rd);
WOLFSSL_API int wolfSSL_peek(WOLFSSL* ssl, void* data, int sz); WOLFSSL_API int wolfSSL_peek(WOLFSSL* ssl, void* data, int sz);
WOLFSSL_ABI WOLFSSL_API int wolfSSL_accept(WOLFSSL* ssl); WOLFSSL_ABI WOLFSSL_API int wolfSSL_accept(WOLFSSL* ssl);
WOLFSSL_API int wolfSSL_inject(WOLFSSL* ssl, const void* data, int sz); WOLFSSL_API int wolfSSL_inject(WOLFSSL* ssl, const void* data, int sz);

2
wolfssl/wolfcrypt/misc.h
View File

@@ -107,6 +107,7 @@ void ByteReverseWords64(word64* out, const word64* in, word32 byteCount);
#endif #endif
WOLFSSL_LOCAL word32 min(word32 a, word32 b); WOLFSSL_LOCAL word32 min(word32 a, word32 b);
#endif #endif
WOLFSSL_LOCAL size_t min_size_t(size_t a, size_t b);
#ifndef WOLFSSL_HAVE_MAX #ifndef WOLFSSL_HAVE_MAX
#if defined(HAVE_FIPS) && !defined(max) /* so ifdef check passes */ #if defined(HAVE_FIPS) && !defined(max) /* so ifdef check passes */
@@ -114,6 +115,7 @@ void ByteReverseWords64(word64* out, const word64* in, word32 byteCount);
#endif #endif
WOLFSSL_LOCAL word32 max(word32 a, word32 b); WOLFSSL_LOCAL word32 max(word32 a, word32 b);
#endif /* WOLFSSL_HAVE_MAX */ #endif /* WOLFSSL_HAVE_MAX */
WOLFSSL_LOCAL size_t max_size_t(size_t a, size_t b);
void c32to24(word32 in, word24 out); void c32to24(word32 in, word24 out);