lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Replace MBEDTLS_ERR_OID_BUF_TOO_SMALL with PSA_ERROR_BUFFER_TOO_SMALL

Browse Source 
Remove the definition of `MBEDTLS_ERR_OID_BUF_TOO_SMALL` in `x509_oid.h`,
and use the corresponding PSA error instead.

```
git grep -l MBEDTLS_ERR_OID_BUF_TOO_SMALL | xargs perl -i -pe 's/\bMBEDTLS_ERR_OID_BUF_TOO_SMALL\b/PSA_ERROR_BUFFER_TOO_SMALL/p'
edit library/x509_oid.h
```

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2025-05-07 21:04:51 +02:00
parent 32a1112e88
commit 47f1d7be95
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/x509.h
View File

@ -498,7 +498,7 @@ size_t mbedtls_x509_crt_parse_cn_inet_pton(const char *cn, void *dst);
* \param oid OID to translate * \param oid OID to translate
* *
* \return Length of the string written (excluding final NULL) or * \return Length of the string written (excluding final NULL) or
* MBEDTLS_ERR_OID_BUF_TOO_SMALL in case of error * PSA_ERROR_BUFFER_TOO_SMALL in case of error
*/ */
int mbedtls_oid_get_numeric_string(char *buf, size_t size, const mbedtls_asn1_buf *oid); int mbedtls_oid_get_numeric_string(char *buf, size_t size, const mbedtls_asn1_buf *oid);

4
library/x509.c
View File

@ -849,7 +849,7 @@ int mbedtls_oid_get_numeric_string(char *buf, size_t size,
ret = mbedtls_snprintf(p, n, ".%u", value); ret = mbedtls_snprintf(p, n, ".%u", value);
} }
if (ret < 2 || (size_t) ret >= n) { if (ret < 2 || (size_t) ret >= n) {
return MBEDTLS_ERR_OID_BUF_TOO_SMALL; return PSA_ERROR_BUFFER_TOO_SMALL;
} }
n -= (size_t) ret; n -= (size_t) ret;
p += ret; p += ret;
@ -912,7 +912,7 @@ int mbedtls_x509_dn_gets(char *buf, size_t size, const mbedtls_x509_name *dn)
p += ret; p += ret;
ret = mbedtls_snprintf(p, n, "="); ret = mbedtls_snprintf(p, n, "=");
print_hexstring = 1; print_hexstring = 1;
} else if (ret == MBEDTLS_ERR_OID_BUF_TOO_SMALL) { } else if (ret == PSA_ERROR_BUFFER_TOO_SMALL) {
return MBEDTLS_ERR_X509_BUFFER_TOO_SMALL; return MBEDTLS_ERR_X509_BUFFER_TOO_SMALL;
} else { } else {
ret = mbedtls_snprintf(p, n, "\?\?="); ret = mbedtls_snprintf(p, n, "\?\?=");

2
library/x509_create.c
View File

@ -314,7 +314,7 @@ static int oid_subidentifier_encode_into(unsigned char **p,
size_t num_bytes = oid_subidentifier_num_bytes(value); size_t num_bytes = oid_subidentifier_num_bytes(value);
if ((size_t) (bound - *p) < num_bytes) { if ((size_t) (bound - *p) < num_bytes) {
return MBEDTLS_ERR_OID_BUF_TOO_SMALL; return PSA_ERROR_BUFFER_TOO_SMALL;
} }
(*p)[num_bytes - 1] = (unsigned char) (value & 0x7f); (*p)[num_bytes - 1] = (unsigned char) (value & 0x7f);
value >>= 7; value >>= 7;

2
library/x509_oid.h
View File

@ -21,8 +21,6 @@
/** OID is not found. */ /** OID is not found. */
#define MBEDTLS_ERR_OID_NOT_FOUND -0x002E #define MBEDTLS_ERR_OID_NOT_FOUND -0x002E
/** output buffer is too small */
#define MBEDTLS_ERR_OID_BUF_TOO_SMALL -0x000B
/* /*
* Maximum number of OID components allowed * Maximum number of OID components allowed

2
tests/suites/test_suite_x509parse.data
View File

@ -2737,7 +2737,7 @@ X509 OID numstring #2 (buffer just fits)
x509_oid_numstr:"2b06010505070301":"1.3.6.1.5.5.7.3.1":18:17 x509_oid_numstr:"2b06010505070301":"1.3.6.1.5.5.7.3.1":18:17
X509 OID numstring #3 (buffer too small) X509 OID numstring #3 (buffer too small)
x509_oid_numstr:"2b06010505070301":"1.3.6.1.5.5.7.3.1":17:MBEDTLS_ERR_OID_BUF_TOO_SMALL x509_oid_numstr:"2b06010505070301":"1.3.6.1.5.5.7.3.1":17:PSA_ERROR_BUFFER_TOO_SMALL
X509 OID numstring #4 (larger number) X509 OID numstring #4 (larger number)
x509_oid_numstr:"2a864886f70d":"1.2.840.113549":15:14 x509_oid_numstr:"2a864886f70d":"1.2.840.113549":15:14