Merge remote-tracking branch 'origin/pr/2558' into development

* origin/pr/2558:
  Skip uncritical unsupported extensions
This commit is contained in:
Jaeden Amero 2019-04-15 13:13:26 +01:00
commit e6d5a501ba

View file

@ -820,7 +820,17 @@ static int x509_get_crt_ext( unsigned char **p,
break;
default:
return( MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE );
/*
* If this is a non-critical extension, which the oid layer
* supports, but there isn't an x509 parser for it,
* skip the extension.
*/
#if !defined(MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION)
if( is_critical )
return( MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE );
else
#endif
*p = end_ext_octet;
}
}