commit 133ab2c8ee5873aed6a0aca52ec1a49272c8d599
author Andres Amaya Garcia <andres.amayagarcia@arm.com> Tue Jan 23 20:03:52 2018 +0000
committer Andres Amaya Garcia <andres.amayagarcia@arm.com> Tue Jan 23 21:21:49 2018 +0000
tree 8098b32c2e295b6e7cb8bb76bd9866414b879754
parent af77213b72f198022d110d43a384859f6bfd98e4

Ensure that mbedtls_pk_parse_key() does not allocate 0 bytes

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 9cad2cd..47203e6 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1210,6 +1210,9 @@
     {
         unsigned char *key_copy;
 
+        if( keylen == 0 )
+            return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT );
+
         if( ( key_copy = mbedtls_calloc( 1, keylen ) ) == NULL )
             return( MBEDTLS_ERR_PK_ALLOC_FAILED );