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

Merge pull request #8162 from yanrayw/2.28-save_stack_usage_pkwrite

Browse Source 
Backport 2.28: pkwrite: use heap to save stack usage for writing keys in PEM string
This commit is contained in:
Bence Szépkúti
2023-10-13 14:27:18 +00:00
committed by GitHub
parent 3841af02f5 4b0b97e18b
commit 01902779a3
2 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.d/pkwrite-pem-use-heap.txt Normal file
View File

@ -0,0 +1,4 @@
Changes
* Use heap memory to allocate DER encoded public/private key.
This reduces stack usage significantly for writing a public/private
key to a PEM string.

50
library/pkwrite.c
View File

@ -571,38 +571,49 @@ end_of_export:
int mbedtls_pk_write_pubkey_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size) int mbedtls_pk_write_pubkey_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
unsigned char output_buf[PUB_DER_MAX_BYTES]; unsigned char *output_buf = NULL;
output_buf = mbedtls_calloc(1, PUB_DER_MAX_BYTES);
if (output_buf == NULL) {
return MBEDTLS_ERR_PK_ALLOC_FAILED;
}
size_t olen = 0; size_t olen = 0;
PK_VALIDATE_RET(key != NULL); PK_VALIDATE_RET(key != NULL);
PK_VALIDATE_RET(buf != NULL || size == 0); PK_VALIDATE_RET(buf != NULL || size == 0);
if ((ret = mbedtls_pk_write_pubkey_der(key, output_buf, if ((ret = mbedtls_pk_write_pubkey_der(key, output_buf,
sizeof(output_buf))) < 0) { PUB_DER_MAX_BYTES)) < 0) {
return ret; goto cleanup;
} }
if ((ret = mbedtls_pem_write_buffer(PEM_BEGIN_PUBLIC_KEY, PEM_END_PUBLIC_KEY, if ((ret = mbedtls_pem_write_buffer(PEM_BEGIN_PUBLIC_KEY, PEM_END_PUBLIC_KEY,
output_buf + sizeof(output_buf) - ret, output_buf + PUB_DER_MAX_BYTES - ret,
ret, buf, size, &olen)) != 0) { ret, buf, size, &olen)) != 0) {
return ret; goto cleanup;
} }
return 0; ret = 0;
cleanup:
mbedtls_free(output_buf);
return ret;
} }
int mbedtls_pk_write_key_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size) int mbedtls_pk_write_key_pem(mbedtls_pk_context *key, unsigned char *buf, size_t size)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
unsigned char output_buf[PRV_DER_MAX_BYTES]; unsigned char *output_buf = NULL;
output_buf = mbedtls_calloc(1, PRV_DER_MAX_BYTES);
if (output_buf == NULL) {
return MBEDTLS_ERR_PK_ALLOC_FAILED;
}
const char *begin, *end; const char *begin, *end;
size_t olen = 0; size_t olen = 0;
PK_VALIDATE_RET(key != NULL); PK_VALIDATE_RET(key != NULL);
PK_VALIDATE_RET(buf != NULL || size == 0); PK_VALIDATE_RET(buf != NULL || size == 0);
if ((ret = mbedtls_pk_write_key_der(key, output_buf, sizeof(output_buf))) < 0) { if ((ret = mbedtls_pk_write_key_der(key, output_buf, PRV_DER_MAX_BYTES)) < 0) {
return ret; goto cleanup;
} }
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
@ -617,15 +628,22 @@ int mbedtls_pk_write_key_pem(mbedtls_pk_context *key, unsigned char *buf, size_t
end = PEM_END_PRIVATE_KEY_EC; end = PEM_END_PRIVATE_KEY_EC;
} else } else
#endif #endif
return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE; {
ret = MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE;
if ((ret = mbedtls_pem_write_buffer(begin, end, goto cleanup;
output_buf + sizeof(output_buf) - ret,
ret, buf, size, &olen)) != 0) {
return ret;
} }
return 0; if ((ret = mbedtls_pem_write_buffer(begin, end,
output_buf + PRV_DER_MAX_BYTES - ret,
ret, buf, size, &olen)) != 0) {
goto cleanup;
}
ret = 0;
cleanup:
mbedtls_platform_zeroize(output_buf, PRV_DER_MAX_BYTES);
mbedtls_free(output_buf);
return ret;
} }
#endif /* MBEDTLS_PEM_WRITE_C */ #endif /* MBEDTLS_PEM_WRITE_C */