Merge remote-tracking branch 'public/pr/1403' into mbedtls-2.1

This commit is contained in:
Simon Butcher 2018-06-01 19:43:55 +01:00
commit fcc7a62bb1
2 changed files with 2 additions and 8 deletions

View file

@ -8,6 +8,8 @@ Bugfix
* Added the macro MBEDTLS_X509_MAX_FILE_PATH_LEN that enables the user to
configure the maximum length of a file path that can be buffered when
calling mbedtls_x509_crt_parse_path().
* Fix redundant declaration of mbedtls_ssl_list_ciphersuites. Raised by
TrinityTonic. #1359.
= mbed TLS 2.1.12 branch released 2018-04-30

8
include/mbedtls/ssl.h Normal file → Executable file
View file

@ -796,14 +796,6 @@ extern int (*mbedtls_ssl_hw_record_read)(mbedtls_ssl_context *ssl);
extern int (*mbedtls_ssl_hw_record_finish)(mbedtls_ssl_context *ssl);
#endif /* MBEDTLS_SSL_HW_RECORD_ACCEL */
/**
* \brief Returns the list of ciphersuites supported by the SSL/TLS module.
*
* \return a statically allocated array of ciphersuites, the last
* entry is 0.
*/
const int *mbedtls_ssl_list_ciphersuites( void );
/**
* \brief Return the name of the ciphersuite associated with the
* given ID