Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-09-14 14:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10006 from stgloorious/fix/before_colon

Browse Source 
Rename BEFORE_COLON/BC to avoid conflicts
This commit is contained in:
David Horstmann
2025-02-27 11:59:12 +00:00
committed by GitHub
parent ede8494d73 b5c079b13c
commit 243e13fb2a
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/x509_crl.c
-5
View File
@@ -582,11 +582,6 @@ int mbedtls_x509_crl_parse_file(mbedtls_x509_crl *chain, const char *path)
#endif /* MBEDTLS_FS_IO */ #endif /* MBEDTLS_FS_IO */
#if !defined(MBEDTLS_X509_REMOVE_INFO) #if !defined(MBEDTLS_X509_REMOVE_INFO)
/*
* Return an informational string about the certificate.
*/
#define BEFORE_COLON 14
#define BC "14"
/* /*
* Return an informational string about the CRL. * Return an informational string about the CRL.
*/ */
library/x509_crt.c
+6 -6
View File
@@ -1743,15 +1743,15 @@ static int x509_info_cert_policies(char **buf, size_t *size,
/* /*
* Return an informational string about the certificate. * Return an informational string about the certificate.
*/ */
#define BEFORE_COLON 18 #define MBEDTLS_BEFORE_COLON 18
#define BC "18" #define MBEDTLS_BEFORE_COLON_STR "18"
int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix, int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
const mbedtls_x509_crt *crt) const mbedtls_x509_crt *crt)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
size_t n; size_t n;
char *p; char *p;
char key_size_str[BEFORE_COLON]; char key_size_str[MBEDTLS_BEFORE_COLON];
p = buf; p = buf;
n = size; n = size;
@@ -1805,13 +1805,13 @@ int mbedtls_x509_crt_info(char *buf, size_t size, const char *prefix,
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
/* Key size */ /* Key size */
if ((ret = mbedtls_x509_key_size_helper(key_size_str, BEFORE_COLON, if ((ret = mbedtls_x509_key_size_helper(key_size_str, MBEDTLS_BEFORE_COLON,
mbedtls_pk_get_name(&crt->pk))) != 0) { mbedtls_pk_get_name(&crt->pk))) != 0) {
return ret; return ret;
} }
ret = mbedtls_snprintf(p, n, "\n%s%-" BC "s: %d bits", prefix, key_size_str, ret = mbedtls_snprintf(p, n, "\n%s%-" MBEDTLS_BEFORE_COLON_STR "s: %d bits",
(int) mbedtls_pk_get_bitlen(&crt->pk)); prefix, key_size_str, (int) mbedtls_pk_get_bitlen(&crt->pk));
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
/* /*
library/x509_csr.c
+6 -6
View File
@@ -519,8 +519,8 @@ int mbedtls_x509_csr_parse_file(mbedtls_x509_csr *csr, const char *path)
#endif /* MBEDTLS_FS_IO */ #endif /* MBEDTLS_FS_IO */
#if !defined(MBEDTLS_X509_REMOVE_INFO) #if !defined(MBEDTLS_X509_REMOVE_INFO)
#define BEFORE_COLON 14 #define MBEDTLS_BEFORE_COLON 14
#define BC "14" #define MBEDTLS_BEFORE_COLON_STR "14"
/* /*
* Return an informational string about the CSR. * Return an informational string about the CSR.
*/ */
@@ -530,7 +530,7 @@ int mbedtls_x509_csr_info(char *buf, size_t size, const char *prefix,
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
size_t n; size_t n;
char *p; char *p;
char key_size_str[BEFORE_COLON]; char key_size_str[MBEDTLS_BEFORE_COLON];
p = buf; p = buf;
n = size; n = size;
@@ -551,13 +551,13 @@ int mbedtls_x509_csr_info(char *buf, size_t size, const char *prefix,
csr->sig_opts); csr->sig_opts);
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
if ((ret = mbedtls_x509_key_size_helper(key_size_str, BEFORE_COLON, if ((ret = mbedtls_x509_key_size_helper(key_size_str, MBEDTLS_BEFORE_COLON,
mbedtls_pk_get_name(&csr->pk))) != 0) { mbedtls_pk_get_name(&csr->pk))) != 0) {
return ret; return ret;
} }
ret = mbedtls_snprintf(p, n, "\n%s%-" BC "s: %d bits\n", prefix, key_size_str, ret = mbedtls_snprintf(p, n, "\n%s%-" MBEDTLS_BEFORE_COLON_STR "s: %d bits\n",
(int) mbedtls_pk_get_bitlen(&csr->pk)); prefix, key_size_str, (int) mbedtls_pk_get_bitlen(&csr->pk));
MBEDTLS_X509_SAFE_SNPRINTF; MBEDTLS_X509_SAFE_SNPRINTF;
/* /*