1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00

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

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

View File

@ -5603,7 +5603,7 @@ void mbedtls_ssl_conf_ciphersuites_for_version( mbedtls_ssl_config *conf,
#if defined(MBEDTLS_X509_CRT_PARSE_C)
void mbedtls_ssl_conf_cert_profile( mbedtls_ssl_config *conf,
mbedtls_x509_crt_profile *profile )
const mbedtls_x509_crt_profile *profile )
{
conf->cert_profile = profile;
}