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

Rename back mbedtls_x509_parse_general_name->mbedtls_x509_parse_subject_alt_name

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-01-03 10:23:13 +01:00
parent db323aa241
commit 9a511c5bdf
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbedtls/x509_crt.h
View File

@ -588,8 +588,8 @@ int mbedtls_x509_crt_parse_path(mbedtls_x509_crt *chain, const char *path);
* SAN type. * SAN type.
* \return Another negative value for any other failure. * \return Another negative value for any other failure.
*/ */
int mbedtls_x509_parse_general_name(const mbedtls_x509_buf *san_buf, int mbedtls_x509_parse_subject_alt_name(const mbedtls_x509_buf *san_buf,
mbedtls_x509_subject_alternative_name *san); mbedtls_x509_subject_alternative_name *san);
#if !defined(MBEDTLS_X509_REMOVE_INFO) #if !defined(MBEDTLS_X509_REMOVE_INFO)
/** /**

8
library/x509_crt.c
View File

@ -685,7 +685,7 @@ static int x509_get_general_names(unsigned char **p,
/* /*
* Check that the SAN is structured correctly. * Check that the SAN is structured correctly.
*/ */
ret = mbedtls_x509_parse_general_name(&(cur->buf), &dummy_san_buf); ret = mbedtls_x509_parse_subject_alt_name(&(cur->buf), &dummy_san_buf);
/* /*
* In case the extension is malformed, return an error, * In case the extension is malformed, return an error,
* and clear the allocated sequences. * and clear the allocated sequences.
@ -1798,7 +1798,7 @@ static int x509_info_subject_alt_name(char **buf, size_t *size,
while (cur != NULL) { while (cur != NULL) {
memset(&san, 0, sizeof(san)); memset(&san, 0, sizeof(san));
parse_ret = mbedtls_x509_parse_general_name(&cur->buf, &san); parse_ret = mbedtls_x509_parse_subject_alt_name(&cur->buf, &san);
if (parse_ret != 0) { if (parse_ret != 0) {
if (parse_ret == MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE) { if (parse_ret == MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE) {
ret = mbedtls_snprintf(p, n, "\n%s <unsupported>", prefix); ret = mbedtls_snprintf(p, n, "\n%s <unsupported>", prefix);
@ -1888,8 +1888,8 @@ static int x509_info_subject_alt_name(char **buf, size_t *size,
return 0; return 0;
} }
int mbedtls_x509_parse_general_name(const mbedtls_x509_buf *san_buf, int mbedtls_x509_parse_subject_alt_name(const mbedtls_x509_buf *san_buf,
mbedtls_x509_subject_alternative_name *san) mbedtls_x509_subject_alternative_name *san)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
switch (san_buf->tag & switch (san_buf->tag &

2
tests/suites/test_suite_x509parse.function
View File

@ -458,7 +458,7 @@ void x509_parse_san(char *crt_file, char *result_str, int parse_result)
if (crt.ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME) { if (crt.ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME) {
cur = &crt.subject_alt_names; cur = &crt.subject_alt_names;
while (cur != NULL) { while (cur != NULL) {
ret = mbedtls_x509_parse_general_name(&cur->buf, &san); ret = mbedtls_x509_parse_subject_alt_name(&cur->buf, &san);
TEST_ASSERT(ret == 0 || ret == MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE); TEST_ASSERT(ret == 0 || ret == MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE);
/* /*
* If san type not supported, ignore. * If san type not supported, ignore.