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

Merge branch 'development' into development-restricted

Browse Source
This commit is contained in:
Simon Butcher
2016-06-23 21:42:26 +01:00
parent c8dd1148f0 e7be5bdb96
commit ab069c6b46
10 changed files with 132 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbedtls/config.h
View File

@ -2566,6 +2566,9 @@
/* \} name SECTION: Customisation configuration options */
/* Target and application specific configurations */
//#define YOTTA_CFG_MBEDTLS_USER_CONFIG_FILE "target_config.h"
/*
* Allow user to override any previous default.
*

5
include/mbedtls/ssl.h
View File

@ -1781,10 +1781,11 @@ void mbedtls_ssl_conf_sig_hashes( mbedtls_ssl_config *conf,
#if defined(MBEDTLS_X509_CRT_PARSE_C)
/**
* \brief Set hostname for ServerName TLS extension
* \brief Set the hostname to check against the received server
* certificate. It sets the ServerName TLS extension too,
* if the extension is enabled.
* (client-side only)
*
*
* \param ssl SSL context
* \param hostname the server hostname
*