Merge remote-tracking branch 'public/pr/1403' into mbedtls-2.1
diff --git a/ChangeLog b/ChangeLog
index 316009d..3f49a21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
* 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
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
old mode 100644
new mode 100755
index 5164460..8573283
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -797,14 +797,6 @@
#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
*