lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-01 10:06:53 +03:00
Code Activity

Revert "pem: auto add newlines to header/footer in mbedtls_pem_write_buffer()"

Browse Source 
This reverts commit 180915018d.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti
2023-12-04 16:11:59 +01:00
parent 8aec84f3a7
commit 4bb5740a7d
6 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/pem.c
View File

@ -473,10 +473,7 @@ int mbedtls_pem_write_buffer(const char *header, const char *footer,
size_t len = 0, use_len, add_len = 0;
mbedtls_base64_encode(NULL, 0, &use_len, der_data, der_len);
/* Newlines are appended to the end of both header and footer, so we
* account for an extra +2. */
add_len = strlen(header) + strlen(footer) + 2 + \
(((use_len > 2) ? (use_len - 2) : 0) / 64) + 1;
add_len = strlen(header) + strlen(footer) + (((use_len > 2) ? (use_len - 2) : 0) / 64) + 1;
if (use_len + add_len > buf_len) {
*olen = use_len + add_len;
@ -496,7 +493,6 @@ int mbedtls_pem_write_buffer(const char *header, const char *footer,
memcpy(p, header, strlen(header));
p += strlen(header);
*p++ = '\n';
c = encode_buf;
while (use_len) {
@ -510,7 +506,6 @@ int mbedtls_pem_write_buffer(const char *header, const char *footer,
memcpy(p, footer, strlen(footer));
p += strlen(footer);
*p++ = '\n';
*p++ = '\0';
*olen = p - buf;

4
library/x509write_crt.c
View File

@ -651,8 +651,8 @@ int mbedtls_x509write_crt_der(mbedtls_x509write_cert *ctx,
return (int) len;
}
#define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----"
#define PEM_END_CRT "-----END CERTIFICATE-----"
#define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n"
#define PEM_END_CRT "-----END CERTIFICATE-----\n"
#if defined(MBEDTLS_PEM_WRITE_C)
int mbedtls_x509write_crt_pem(mbedtls_x509write_cert *crt,

4
library/x509write_csr.c
View File

@ -302,8 +302,8 @@ int mbedtls_x509write_csr_der(mbedtls_x509write_csr *ctx, unsigned char *buf,
return ret;
}
#define PEM_BEGIN_CSR "-----BEGIN CERTIFICATE REQUEST-----"
#define PEM_END_CSR "-----END CERTIFICATE REQUEST-----"
#define PEM_BEGIN_CSR "-----BEGIN CERTIFICATE REQUEST-----\n"
#define PEM_END_CSR "-----END CERTIFICATE REQUEST-----\n"
#if defined(MBEDTLS_PEM_WRITE_C)
int mbedtls_x509write_csr_pem(mbedtls_x509write_csr *ctx, unsigned char *buf, size_t size,