Merge 'development' into iotssl-411-port-reuse

Conflicts:
	ChangeLog
This commit is contained in:
Simon Butcher 2015-09-16 15:25:53 +01:00
commit 5793e7ef01
6 changed files with 14 additions and 7 deletions

View file

@ -1387,7 +1387,7 @@ void mbedtls_ssl_conf_ciphersuites_for_version( mbedtls_ssl_config *conf,
* \param profile Profile to use
*/
void mbedtls_ssl_conf_cert_profile( mbedtls_ssl_config *conf,
mbedtls_x509_crt_profile *profile );
const mbedtls_x509_crt_profile *profile );
/**
* \brief Set the data required to verify peer certificate