mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-11 18:40:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8160 from daverodgman/warn-unreachable

Browse Source 
Fix clang warnings about unreachable code
This commit is contained in:
Gilles Peskine 2023-09-06 09:47:03 +00:00 committed by GitHub
commit 58590983c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/mbedtls/bignum.h
View File

@ -186,6 +186,15 @@ typedef uint64_t mbedtls_t_udbl;
#endif /* !MBEDTLS_NO_UDBL_DIVISION */ #endif /* !MBEDTLS_NO_UDBL_DIVISION */
#endif /* !MBEDTLS_HAVE_INT64 */ #endif /* !MBEDTLS_HAVE_INT64 */
/*
* Sanity check that exactly one of MBEDTLS_HAVE_INT32 or MBEDTLS_HAVE_INT64 is defined,
* so that code elsewhere doesn't have to check.
*/
#if (!(defined(MBEDTLS_HAVE_INT32) || defined(MBEDTLS_HAVE_INT64))) || \
(defined(MBEDTLS_HAVE_INT32) && defined(MBEDTLS_HAVE_INT64))
#error "Only 32-bit or 64-bit limbs are supported in bignum"
#endif
/** \typedef mbedtls_mpi_uint /** \typedef mbedtls_mpi_uint
* \brief The type of machine digits in a bignum, called _limbs_. * \brief The type of machine digits in a bignum, called _limbs_.
* *

31
library/bignum_core.c
View File

@ -77,38 +77,17 @@ size_t mbedtls_mpi_core_bitlen(const mbedtls_mpi_uint *A, size_t A_limbs)
return 0; return 0;
} }
/* Convert a big-endian byte array aligned to the size of mbedtls_mpi_uint
* into the storage form used by mbedtls_mpi. */
static mbedtls_mpi_uint mpi_bigendian_to_host_c(mbedtls_mpi_uint a)
{
uint8_t i;
unsigned char *a_ptr;
mbedtls_mpi_uint tmp = 0;
for (i = 0, a_ptr = (unsigned char *) &a; i < ciL; i++, a_ptr++) {
tmp <<= CHAR_BIT;
tmp |= (mbedtls_mpi_uint) *a_ptr;
}
return tmp;
}
static mbedtls_mpi_uint mpi_bigendian_to_host(mbedtls_mpi_uint a) static mbedtls_mpi_uint mpi_bigendian_to_host(mbedtls_mpi_uint a)
{ {
if (MBEDTLS_IS_BIG_ENDIAN) { if (MBEDTLS_IS_BIG_ENDIAN) {
/* Nothing to do on bigendian systems. */ /* Nothing to do on bigendian systems. */
return a; return a;
} else { } else {
switch (sizeof(mbedtls_mpi_uint)) { #if defined(MBEDTLS_HAVE_INT32)
case 4: return (mbedtls_mpi_uint) MBEDTLS_BSWAP32(a);
return (mbedtls_mpi_uint) MBEDTLS_BSWAP32((uint32_t) a); #elif defined(MBEDTLS_HAVE_INT64)
case 8: return (mbedtls_mpi_uint) MBEDTLS_BSWAP64(a);
return (mbedtls_mpi_uint) MBEDTLS_BSWAP64((uint64_t) a); #endif
}
/* Fall back to C-based reordering if we don't know the byte order
* or we couldn't use a compiler-specific builtin. */
return mpi_bigendian_to_host_c(a);
} }
} }

4
library/x509_crt.c
View File

@ -2754,8 +2754,8 @@ static int x509_inet_pton_ipv6(const char *src, void *dst)
p++; p++;
} }
if (num_digits != 0) { if (num_digits != 0) {
addr[nonzero_groups++] = MBEDTLS_IS_BIG_ENDIAN ? group : MBEDTLS_PUT_UINT16_BE(group, addr, nonzero_groups);
(group << 8) | (group >> 8); nonzero_groups++;
if (*p == '\0') { if (*p == '\0') {
break; break;
} else if (*p == '.') { } else if (*p == '.') {