mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2024-12-26 18:20:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add error returns in utf validator

Browse Source 
Signed-off-by: Agathiyan Bragadeesh <agathiyan.bragadeesh2@arm.com>
This commit is contained in:
Agathiyan Bragadeesh 2023-09-12 15:56:27 +01:00
parent e9c72fbc2e
commit f59f10f1d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/x509_create.c
View File

@ -254,7 +254,7 @@ static int validate_utf8(unsigned char *data, size_t len)
utf_bytes = 4;
code_point = code_point | (uint32_t) (*d & 0x07) << 18;
} else {
return MBEDTLS_ERROR_C;
return MBEDTLS_ERR_X509_INVALID_NAME;
}
for (i = utf_bytes-1; i > 0; i--) {
if (d + 1 >= end) {
@ -266,18 +266,18 @@ static int validate_utf8(unsigned char *data, size_t len)
switch (utf_bytes) {
case 2:
if (!(0x80 < code_point && code_point < 0x7FF)) {
return MBEDTLS_ERROR_C; //bad encoding
return MBEDTLS_ERR_X509_INVALID_NAME; //bad encoding
}
break;
case 3:
if (!(0x800 < code_point && code_point < 0xD7FF) &&
!(0xE000 < utf_bytes && utf_bytes < 0xFFFF)) {
return MBEDTLS_ERROR_C; //bad encoding
return MBEDTLS_ERR_X509_INVALID_NAME; //bad encoding
}
break;
case 4:
if (!(0x10000 < code_point && code_point < 0x10FFFF)) {
return MBEDTLS_ERROR_C; //bad encoding
return MBEDTLS_ERR_X509_INVALID_NAME; //bad encoding
}
break;
}