mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-02 16:21:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor ipv6 parsing

Browse Source 
Introduce new variables to make it more readable. Clarify the calculations a bit.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
This commit is contained in:
Andrzej Kurek 2023-04-13 09:09:56 -04:00
parent 7f5a1a4525
commit 0d57896f7e
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/x509_crt.c
View File

@ -2571,7 +2571,7 @@ static int x509_inet_pton_ipv4(const char *src, void *dst);
static int x509_inet_pton_ipv6(const char *src, void *dst) static int x509_inet_pton_ipv6(const char *src, void *dst)
{ {
const unsigned char *character = (const unsigned char *) src; const unsigned char *character = (const unsigned char *) src;
int num_groups = 0, num_digits, zero_group_start = -1; int nonzero_groups = 0, num_digits, zero_group_start = -1;
uint16_t addr[8]; uint16_t addr[8];
do { do {
/* note: allows excess leading 0's, e.g. 1:0002:3:... */ /* note: allows excess leading 0's, e.g. 1:0002:3:... */
@ -2581,16 +2581,19 @@ static int x509_inet_pton_ipv6(const char *src, void *dst)
; ;
} }
if (num_digits != 0) { if (num_digits != 0) {
addr[num_groups++] = MBEDTLS_IS_BIG_ENDIAN ? group : (group << 8) | (group >> 8); addr[nonzero_groups++] = MBEDTLS_IS_BIG_ENDIAN ? group :
(group << 8) | (group >> 8);
if (*character == '\0') { if (*character == '\0') {
break; break;
} else if (*character == '.' && (num_groups != 0 || zero_group_start != -1) && } else if (*character == '.' && (nonzero_groups != 0 ||
(num_groups < 7) && zero_group_start != -1) &&
(nonzero_groups < 7) &&
/* walk back to prior ':', then parse as IPv4-mapped */ /* walk back to prior ':', then parse as IPv4-mapped */
(*--character == ':' || *--character == ':' || (*--character == ':' || *--character == ':' ||
*--character == ':' || *--character == ':') && *--character == ':' || *--character == ':') &&
x509_inet_pton_ipv4((const char *) ++character, addr + --num_groups) == 0) { x509_inet_pton_ipv4((const char *) ++character,
num_groups += 2; addr + --nonzero_groups) == 0) {
nonzero_groups += 2;
character = (const unsigned char *) ""; character = (const unsigned char *) "";
break; break;
} else if (*character != ':') { } else if (*character != ':') {
@ -2598,7 +2601,8 @@ static int x509_inet_pton_ipv6(const char *src, void *dst)
} }
} else { } else {
if (zero_group_start != -1 || *character != ':' || if (zero_group_start != -1 || *character != ':' ||
((zero_group_start = num_groups) == 0 && *++character != ':')) { ((zero_group_start = nonzero_groups) == 0 &&
*++character != ':')) {
return -1; return -1;
} }
if (character[1] == '\0') { if (character[1] == '\0') {
@ -2607,21 +2611,23 @@ static int x509_inet_pton_ipv6(const char *src, void *dst)
} }
} }
++character; ++character;
} while (num_groups < 8); } while (nonzero_groups < 8);
if ((zero_group_start != -1 ? num_groups > 6 : num_groups != 8) || *character != '\0') { if ((zero_group_start != -1 ? nonzero_groups > 6 : nonzero_groups != 8) ||
*character != '\0') {
return -1; return -1;
} }
if (zero_group_start != -1) { if (zero_group_start != -1) {
int num_zero_groups = 0; int zero_groups = 8 - nonzero_groups;
num_groups -= zero_group_start; int groups_after_zero = nonzero_groups - zero_group_start;
num_zero_groups = 8 - num_groups - zero_group_start;
if (num_groups) { /* Move the non-zero part to after the zeroes */
memmove(addr + zero_group_start + num_zero_groups, if (groups_after_zero) {
memmove(addr + zero_group_start + zero_groups,
addr + zero_group_start, addr + zero_group_start,
num_groups * sizeof(*addr)); groups_after_zero * sizeof(*addr));
} }
memset(addr + zero_group_start, 0, num_zero_groups * sizeof(*addr)); memset(addr + zero_group_start, 0, zero_groups * sizeof(*addr));
} }
memcpy(dst, addr, sizeof(addr)); memcpy(dst, addr, sizeof(addr));
return 0; return 0;