Merge remote-tracking branch 'upstream-restricted/pr/459' into mbedtls-2.7-restricted-proposed

This commit is contained in:
Jaeden Amero 2018-03-14 18:15:31 +00:00
commit 73923e1575
4 changed files with 25 additions and 9 deletions

View file

@ -181,6 +181,10 @@ static int pk_get_ecparams( unsigned char **p, const unsigned char *end,
{
int ret;
if ( end - *p < 1 )
return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT +
MBEDTLS_ERR_ASN1_OUT_OF_DATA );
/* Tag may be either OID or SEQUENCE */
params->tag = **p;
if( params->tag != MBEDTLS_ASN1_OID