mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-06 12:40:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream-public/pr/1423' into development-proposed

Browse Source
This commit is contained in:
Jaeden Amero 2018-03-14 17:24:44 +00:00
commit 64293777eb
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -28,6 +28,10 @@ Features
OpenVPN Inc. Fixes #1339 OpenVPN Inc. Fixes #1339
* Add support for public keys encoded in PKCS#1 format. #1122 * Add support for public keys encoded in PKCS#1 format. #1122
New deprecations
* Deprecate support for record compression (configuration option
MBEDTLS_ZLIB_SUPPORT).
Bugfix Bugfix
* Fix the name of a DHE parameter that was accidentally changed in 2.7.0. * Fix the name of a DHE parameter that was accidentally changed in 2.7.0.
Fixes #1358. Fixes #1358.

3
include/mbedtls/config.h
View File

@ -1542,6 +1542,9 @@
* *
* \note Currently compression can't be used with DTLS. * \note Currently compression can't be used with DTLS.
* *
* \deprecated This feature is deprecated and will be removed
* in the next major revision of the library.
*
* Used in: library/ssl_tls.c * Used in: library/ssl_tls.c
* library/ssl_cli.c * library/ssl_cli.c
* library/ssl_srv.c * library/ssl_srv.c

9
include/mbedtls/ssl.h
View File

@ -49,6 +49,15 @@
#endif #endif
#if defined(MBEDTLS_ZLIB_SUPPORT) #if defined(MBEDTLS_ZLIB_SUPPORT)
#if defined(MBEDTLS_DEPRECATED_WARNING)
#warning "Record compression support via MBEDTLS_ZLIB_SUPPORT is deprecated and will be removed in the next major revision of the library"
#endif
#if defined(MBEDTLS_DEPRECATED_REMOVED)
#error "Record compression support via MBEDTLS_ZLIB_SUPPORT is deprecated and cannot be used if MBEDTLS_DEPRECATED_REMOVED is set"
#endif
#include "zlib.h" #include "zlib.h"
#endif #endif