yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove DIY SIZE_MAX definitions

Browse source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-05-18 20:49:03 +01:00
parent 399fa48e95
commit 68ef1d6ee6
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/base64.c
View file

@ -17,6 +17,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include <limits.h>
#include "common.h" #include "common.h"
#if defined(MBEDTLS_BASE64_C) #if defined(MBEDTLS_BASE64_C)
@ -31,8 +33,6 @@
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */ #endif /* MBEDTLS_SELF_TEST */
#define BASE64_SIZE_T_MAX ((size_t) -1) /* SIZE_T_MAX is not standard */
/* /*
* Encode a buffer into base64 format * Encode a buffer into base64 format
*/ */
@ -50,8 +50,8 @@ int mbedtls_base64_encode(unsigned char *dst, size_t dlen, size_t *olen,
n = slen / 3 + (slen % 3 != 0); n = slen / 3 + (slen % 3 != 0);
if (n > (BASE64_SIZE_T_MAX - 1) / 4) { if (n > (SIZE_MAX - 1) / 4) {
*olen = BASE64_SIZE_T_MAX; *olen = SIZE_MAX;
return MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL; return MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL;
} }

4
library/bignum.c
View file

@ -54,8 +54,6 @@
#define MPI_VALIDATE(cond) \ #define MPI_VALIDATE(cond) \
MBEDTLS_INTERNAL_VALIDATE(cond) MBEDTLS_INTERNAL_VALIDATE(cond)
#define MPI_SIZE_T_MAX ((size_t) -1) /* SIZE_T_MAX is not standard */
/* Implementation that should never be optimized out by the compiler */ /* Implementation that should never be optimized out by the compiler */
static void mbedtls_mpi_zeroize(mbedtls_mpi_uint *v, size_t n) static void mbedtls_mpi_zeroize(mbedtls_mpi_uint *v, size_t n)
{ {
@ -416,7 +414,7 @@ int mbedtls_mpi_read_string(mbedtls_mpi *X, int radix, const char *s)
slen = strlen(s); slen = strlen(s);
if (radix == 16) { if (radix == 16) {
if (slen > MPI_SIZE_T_MAX >> 2) { if (slen > SIZE_MAX >> 2) {
return MBEDTLS_ERR_MPI_BAD_INPUT_DATA; return MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
} }