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

Disallow leading zeroes when parsing IPv4 addresses

Browse Source 
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
This commit is contained in:
Andrzej Kurek 2023-05-01 05:26:47 -04:00
parent 14d6b1124b
commit 6f400a376e
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/x509_crt.c
View File

@ -2667,7 +2667,6 @@ static int x509_inet_pton_ipv6(const char *src, void *dst)
static int x509_inet_pton_ipv4(const char *src, void *dst)
{
/* note: allows leading 0's, e.g. 000.000.000.000 */
const unsigned char *p = (const unsigned char *) src;
uint8_t *res = (uint8_t *) dst;
uint8_t digit, num_digits = 0;
@ -2681,6 +2680,13 @@ static int x509_inet_pton_ipv4(const char *src, void *dst)
if (digit > 9) {
break;
}
/* Don't allow leading zeroes. These might mean octal format,
* which this implementation does not support. */
if (octet == 0 && num_digits > 0) {
break;
}
octet = octet * 10 + digit;
num_digits++;
p++;

6
tests/suites/test_suite_x509parse.data
View File

@ -1046,6 +1046,12 @@ x509_verify:"data_files/server5-tricky-ip-san.crt":"data_files/server5-tricky-ip
X509 CRT parse CN: IPv4 valid address
x509_crt_parse_cn_inet_pton:"10.10.10.10":"0A0A0A0A":4
X509 CRT parse CN: IPv4 leading zeroes #1
x509_crt_parse_cn_inet_pton:"010.10.10.10":"":0
X509 CRT parse CN: IPv4 leading zeroes #2
x509_crt_parse_cn_inet_pton:"10.10.10.001":"":0
X509 CRT parse CN: IPv4 excess 0s
x509_crt_parse_cn_inet_pton:"10.0000.10.10":"":0