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

Enable escaping ';' in cert_write.c SANs

Browse source 
This might get used in URIs.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
This commit is contained in:
Andrzej Kurek 2023-04-27 07:50:56 -04:00
parent 908716f097
commit 5eebfb8fd0
1 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
programs/x509/cert_write.c
View file

@ -322,7 +322,7 @@ int main(int argc, char *argv[])
char buf[1024]; char buf[1024];
char issuer_name[256]; char issuer_name[256];
int i; int i;
char *p, *q, *r, *r2; char *p, *q, *r;
#if defined(MBEDTLS_X509_CSR_PARSE_C) #if defined(MBEDTLS_X509_CSR_PARSE_C)
char subject_name[256]; char subject_name[256];
mbedtls_x509_csr csr; mbedtls_x509_csr csr;
@ -553,11 +553,34 @@ usage:
q = r; q = r;
} }
} else if (strcmp(p, "san") == 0) { } else if (strcmp(p, "san") == 0) {
char *subtype_value;
prev = NULL; prev = NULL;
while (q != NULL) { while (q != NULL) {
if ((r = strchr(q, ';')) != NULL) { char *semicolon;
r = q;
/* Find the first non-escaped ; occurrence and remove escaped ones */
do {
if ((semicolon = strchr(r, ';')) != NULL) {
if (*(semicolon-1) != '\\') {
r = semicolon;
break;
}
/* Remove the escape character */
size_t size_left = strlen(semicolon);
memmove(semicolon-1, semicolon, size_left);
*(semicolon + size_left - 1) = '\0';
/* r will now point at the character after the semicolon */
r = semicolon;
}
} while (semicolon != NULL);
if (semicolon != NULL) {
*r++ = '\0'; *r++ = '\0';
} else {
r = NULL;
} }
cur = mbedtls_calloc(1, sizeof(mbedtls_x509_san_list)); cur = mbedtls_calloc(1, sizeof(mbedtls_x509_san_list));
@ -568,8 +591,8 @@ usage:
cur->next = NULL; cur->next = NULL;
if ((r2 = strchr(q, ':')) != NULL) { if ((subtype_value = strchr(q, ':')) != NULL) {
*r2++ = '\0'; *subtype_value++ = '\0';
} }
if (strcmp(q, "RFC822") == 0) { if (strcmp(q, "RFC822") == 0) {
cur->node.type = MBEDTLS_X509_SAN_RFC822_NAME; cur->node.type = MBEDTLS_X509_SAN_RFC822_NAME;
@ -579,13 +602,13 @@ usage:
cur->node.type = MBEDTLS_X509_SAN_DNS_NAME; cur->node.type = MBEDTLS_X509_SAN_DNS_NAME;
} else if (strcmp(q, "IP") == 0) { } else if (strcmp(q, "IP") == 0) {
cur->node.type = MBEDTLS_X509_SAN_IP_ADDRESS; cur->node.type = MBEDTLS_X509_SAN_IP_ADDRESS;
ip_string_to_bytes(r2, ip, 4); ip_string_to_bytes(subtype_value, ip, 4);
cur->node.san.unstructured_name.p = (unsigned char *) ip; cur->node.san.unstructured_name.p = (unsigned char *) ip;
cur->node.san.unstructured_name.len = sizeof(ip); cur->node.san.unstructured_name.len = sizeof(ip);
} else if (strcmp(q, "DN") == 0) { } else if (strcmp(q, "DN") == 0) {
cur->node.type = MBEDTLS_X509_SAN_DIRECTORY_NAME; cur->node.type = MBEDTLS_X509_SAN_DIRECTORY_NAME;
if ((ret = mbedtls_x509_string_to_names(&ext_san_dirname, if ((ret = mbedtls_x509_string_to_names(&ext_san_dirname,
r2)) != 0) { subtype_value)) != 0) {
mbedtls_strerror(ret, buf, sizeof(buf)); mbedtls_strerror(ret, buf, sizeof(buf));
mbedtls_printf( mbedtls_printf(
" failed\n ! mbedtls_x509_string_to_names " " failed\n ! mbedtls_x509_string_to_names "
@ -600,9 +623,8 @@ usage:
} }
if (strcmp(q, "IP") != 0 && strcmp(q, "DN") != 0) { if (strcmp(q, "IP") != 0 && strcmp(q, "DN") != 0) {
q = r2; cur->node.san.unstructured_name.p = (unsigned char *) subtype_value;
cur->node.san.unstructured_name.p = (unsigned char *) q; cur->node.san.unstructured_name.len = strlen(subtype_value);
cur->node.san.unstructured_name.len = strlen(q);
} }
if (prev == NULL) { if (prev == NULL) {