AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5309 from gilles-peskine-arm/pkparse-pkcs8-unencrypted-no-alloc

Browse Source 
mbedtls_pk_parse_key: don't allocate if not needed
This commit is contained in:
Dave Rodgman 2022-01-24 10:03:48 +00:00 committed by GitHub
commit b032685543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/pkparse-pkcs8-unencrypted-no-alloc.txt Normal file
View File

@ -0,0 +1,3 @@
Changes
* In mbedtls_pk_parse_key(), if no password is provided, don't allocate a
temporary variable on the heap. Suggested by Sergey Kanatov in #5304.

1
library/pkparse.c
View File

@ -1343,6 +1343,7 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
* error
*/
#if defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
if( pwdlen != 0 )
{
unsigned char *key_copy;