commit | e9124b943da5c30899cc75294f390d46ea23c995 | [log] [tgz] |
---|---|---|
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 20:03:52 2018 +0000 |
tree | 760bc0fb2e387648b7145713a23c82ad9bdaf6aa | |
parent | c9d6226d2c7b7a99be6694c6014e4e4be1cc69d7 [diff] |
Ensure that mbedtls_pk_parse_key() does not allocate 0 bytes
diff --git a/library/pkparse.c b/library/pkparse.c index f97d89e..491cecf 100644 --- a/library/pkparse.c +++ b/library/pkparse.c
@@ -1274,6 +1274,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 );