ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-24 14:20:59 +08:00
Code Issues Releases Wiki Activity

Use MBEDTLS_ERROR_ADD() and tag macros

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-01-30 14:38:18 +01:00
parent 8a13866f65
commit 3520fe6fda
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/x509_crt.c
View File

@ -609,14 +609,15 @@ static int x509_get_subject_key_id(unsigned char **p,
} }
if (*p != end) { if (*p != end) {
return MBEDTLS_ERR_X509_INVALID_EXTENSIONS + return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_X509_INVALID_EXTENSIONS,
MBEDTLS_ERR_ASN1_LENGTH_MISMATCH; MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
} }
return 0; return 0;
} }
/* /*
* SubjectAltName ::= GeneralNames
* GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName * GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
* *
* GeneralName ::= CHOICE { * GeneralName ::= CHOICE {
@ -677,8 +678,8 @@ static int x509_get_general_names(unsigned char **p,
MBEDTLS_ASN1_CONTEXT_SPECIFIC) { MBEDTLS_ASN1_CONTEXT_SPECIFIC) {
if ((tag & (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != if ((tag & (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) !=
(MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) { (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) {
return MBEDTLS_ERR_X509_INVALID_EXTENSIONS + return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_X509_INVALID_EXTENSIONS,
MBEDTLS_ERR_ASN1_UNEXPECTED_TAG; MBEDTLS_ERR_ASN1_UNEXPECTED_TAG);
} }
} }
@ -746,7 +747,7 @@ static int x509_get_authority_key_id(unsigned char **p,
size_t len = 0u; size_t len = 0u;
if ((ret = mbedtls_asn1_get_tag(p, end, &len, if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE | 0)) != 0) { MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)) != 0) {
return ret; return ret;
} }
@ -768,13 +769,14 @@ static int x509_get_authority_key_id(unsigned char **p,
/* Getting authorityCertIssuer using the required specific class tag [1] */ /* Getting authorityCertIssuer using the required specific class tag [1] */
if ((ret = mbedtls_asn1_get_tag(p, end, &len, if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED |
1)) != 0) { MBEDTLS_X509_SAN_RFC822_NAME)) != 0) {
/* authorityCertIssuer is an OPTIONAL field */ /* authorityCertIssuer is an OPTIONAL field */
} else { } else {
/* Getting directoryName using the required specific class tag [4] */ /* Getting directoryName using the required specific class tag [4] */
if ((ret = mbedtls_asn1_get_tag(p, end, &len, if ((ret = mbedtls_asn1_get_tag(p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONTEXT_SPECIFIC |
MBEDTLS_ASN1_CONSTRUCTED | 4)) != 0) { MBEDTLS_ASN1_CONSTRUCTED |
MBEDTLS_X509_SAN_DIRECTORY_NAME)) != 0) {
return ret; return ret;
} else { } else {
/* "end" also includes the CertSerialNumber field so "len" shall be used */ /* "end" also includes the CertSerialNumber field so "len" shall be used */