|
|
@@ -1,6 +1,6 @@
|
|
|
--- a/include/mbedtls/config.h
|
|
|
+++ b/include/mbedtls/config.h
|
|
|
-@@ -599,14 +599,14 @@
|
|
|
+@@ -633,14 +633,14 @@
|
|
|
*
|
|
|
* Enable Output Feedback mode (OFB) for symmetric ciphers.
|
|
|
*/
|
|
|
@@ -17,7 +17,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_CIPHER_NULL_CIPHER
|
|
|
-@@ -716,19 +716,19 @@
|
|
|
+@@ -750,19 +750,19 @@
|
|
|
*
|
|
|
* Comment macros to disable the curve and functions for it
|
|
|
*/
|
|
|
@@ -46,7 +46,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_ECP_NIST_OPTIM
|
|
|
-@@ -830,7 +830,7 @@
|
|
|
+@@ -864,7 +864,7 @@
|
|
|
* See dhm.h for more details.
|
|
|
*
|
|
|
*/
|
|
|
@@ -55,7 +55,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
|
|
|
-@@ -850,7 +850,7 @@
|
|
|
+@@ -884,7 +884,7 @@
|
|
|
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
|
|
|
*/
|
|
|
@@ -64,7 +64,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
|
|
|
-@@ -875,7 +875,7 @@
|
|
|
+@@ -909,7 +909,7 @@
|
|
|
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
|
|
|
*/
|
|
|
@@ -73,7 +73,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
|
|
|
-@@ -1009,7 +1009,7 @@
|
|
|
+@@ -1043,7 +1043,7 @@
|
|
|
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
|
*/
|
|
|
@@ -82,7 +82,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
|
-@@ -1033,7 +1033,7 @@
|
|
|
+@@ -1067,7 +1067,7 @@
|
|
|
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
|
*/
|
|
|
@@ -91,7 +91,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
|
|
|
-@@ -1137,7 +1137,7 @@
|
|
|
+@@ -1171,7 +1171,7 @@
|
|
|
* This option is only useful if both MBEDTLS_SHA256_C and
|
|
|
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
|
|
|
*/
|
|
|
@@ -100,7 +100,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_ENTROPY_NV_SEED
|
|
|
-@@ -1232,14 +1232,14 @@
|
|
|
+@@ -1266,14 +1266,14 @@
|
|
|
* Uncomment this macro to disable the use of CRT in RSA.
|
|
|
*
|
|
|
*/
|
|
|
@@ -117,7 +117,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_SHA256_SMALLER
|
|
|
-@@ -1393,7 +1393,7 @@
|
|
|
+@@ -1427,7 +1427,7 @@
|
|
|
* configuration of this extension).
|
|
|
*
|
|
|
*/
|
|
|
@@ -126,7 +126,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
|
|
|
-@@ -1568,7 +1568,7 @@
|
|
|
+@@ -1602,7 +1602,7 @@
|
|
|
*
|
|
|
* Comment this macro to disable support for SSL session tickets
|
|
|
*/
|
|
|
@@ -135,7 +135,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_SSL_EXPORT_KEYS
|
|
|
-@@ -1598,7 +1598,7 @@
|
|
|
+@@ -1632,7 +1632,7 @@
|
|
|
*
|
|
|
* Comment this macro to disable support for truncated HMAC in SSL
|
|
|
*/
|
|
|
@@ -144,7 +144,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
|
|
|
-@@ -1657,7 +1657,7 @@
|
|
|
+@@ -1691,7 +1691,7 @@
|
|
|
*
|
|
|
* Comment this to disable run-time checking and save ROM space
|
|
|
*/
|
|
|
@@ -153,7 +153,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
|
|
|
-@@ -1987,7 +1987,7 @@
|
|
|
+@@ -2021,7 +2021,7 @@
|
|
|
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
*/
|
|
|
@@ -162,7 +162,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_ARIA_C
|
|
|
-@@ -2053,7 +2053,7 @@
|
|
|
+@@ -2087,7 +2087,7 @@
|
|
|
* This module enables the AES-CCM ciphersuites, if other requisites are
|
|
|
* enabled as well.
|
|
|
*/
|
|
|
@@ -171,7 +171,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_CERTS_C
|
|
|
-@@ -2065,7 +2065,7 @@
|
|
|
+@@ -2099,7 +2099,7 @@
|
|
|
*
|
|
|
* This module is used for testing (ssl_client/server).
|
|
|
*/
|
|
|
@@ -180,7 +180,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_CHACHA20_C
|
|
|
-@@ -2169,7 +2169,7 @@
|
|
|
+@@ -2203,7 +2203,7 @@
|
|
|
* \warning DES is considered a weak cipher and its use constitutes a
|
|
|
* security risk. We recommend considering stronger ciphers instead.
|
|
|
*/
|
|
|
@@ -189,7 +189,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_DHM_C
|
|
|
-@@ -2332,7 +2332,7 @@
|
|
|
+@@ -2366,7 +2366,7 @@
|
|
|
* This module adds support for the Hashed Message Authentication Code
|
|
|
* (HMAC)-based key derivation function (HKDF).
|
|
|
*/
|
|
|
@@ -198,7 +198,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_HMAC_DRBG_C
|
|
|
-@@ -2642,7 +2642,7 @@
|
|
|
+@@ -2676,7 +2676,7 @@
|
|
|
*
|
|
|
* This module enables abstraction of common (libc) functions.
|
|
|
*/
|
|
|
@@ -207,7 +207,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_POLY1305_C
|
|
|
-@@ -2663,7 +2663,7 @@
|
|
|
+@@ -2697,7 +2697,7 @@
|
|
|
* Caller: library/md.c
|
|
|
*
|
|
|
*/
|
|
|
@@ -216,7 +216,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_RSA_C
|
|
|
-@@ -2770,7 +2770,7 @@
|
|
|
+@@ -2804,7 +2804,7 @@
|
|
|
*
|
|
|
* Requires: MBEDTLS_CIPHER_C
|
|
|
*/
|
|
|
@@ -225,7 +225,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_SSL_CLI_C
|
|
|
-@@ -2870,7 +2870,7 @@
|
|
|
+@@ -2904,7 +2904,7 @@
|
|
|
*
|
|
|
* This module provides run-time version information.
|
|
|
*/
|
|
|
@@ -234,7 +234,7 @@
|
|
|
|
|
|
/**
|
|
|
* \def MBEDTLS_X509_USE_C
|
|
|
-@@ -2980,7 +2980,7 @@
|
|
|
+@@ -3014,7 +3014,7 @@
|
|
|
* Module: library/xtea.c
|
|
|
* Caller:
|
|
|
*/
|