From 133ab2c8ee5873aed6a0aca52ec1a49272c8d599 Mon Sep 17 00:00:00 2001
From: Andres Amaya Garcia <andres.amayagarcia@arm.com>
Date: Tue, 23 Jan 2018 20:03:52 +0000
Subject: [PATCH] Ensure that mbedtls_pk_parse_key() does not allocate 0 bytes

---
 library/pkparse.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/pkparse.c b/library/pkparse.c
index 9cad2cd81..47203e687 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1210,6 +1210,9 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
     {
         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 );