|
|
@ -1,6 +1,6 @@ |
|
|
|
--- a/include/mbedtls/config.h
|
|
|
|
--- a/include/mbedtls/config.h
|
|
|
|
+++ b/include/mbedtls/config.h
|
|
|
|
+++ b/include/mbedtls/config.h
|
|
|
|
@@ -557,14 +557,14 @@
|
|
|
|
@@ -599,14 +599,14 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Enable Output Feedback mode (OFB) for symmetric ciphers.
|
|
|
|
* Enable Output Feedback mode (OFB) for symmetric ciphers.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -17,7 +17,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_CIPHER_NULL_CIPHER
|
|
|
|
* \def MBEDTLS_CIPHER_NULL_CIPHER
|
|
|
|
@@ -654,19 +654,19 @@
|
|
|
|
@@ -696,19 +696,19 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Comment macros to disable the curve and functions for it
|
|
|
|
* Comment macros to disable the curve and functions for it
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -46,7 +46,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_ECP_NIST_OPTIM
|
|
|
|
* \def MBEDTLS_ECP_NIST_OPTIM
|
|
|
|
@@ -768,7 +768,7 @@
|
|
|
|
@@ -810,7 +810,7 @@
|
|
|
|
* See dhm.h for more details.
|
|
|
|
* See dhm.h for more details.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -55,7 +55,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
|
|
|
|
@@ -788,7 +788,7 @@
|
|
|
|
@@ -830,7 +830,7 @@
|
|
|
|
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
|
|
|
|
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -64,7 +64,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
|
|
|
|
@@ -813,7 +813,7 @@
|
|
|
|
@@ -855,7 +855,7 @@
|
|
|
|
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
|
|
|
|
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -73,7 +73,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
|
|
|
|
@@ -947,7 +947,7 @@
|
|
|
|
@@ -989,7 +989,7 @@
|
|
|
|
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
|
|
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -82,7 +82,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
|
|
@@ -971,7 +971,7 @@
|
|
|
|
@@ -1013,7 +1013,7 @@
|
|
|
|
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
|
|
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -91,7 +91,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
|
|
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
|
|
|
|
@@ -1075,7 +1075,7 @@
|
|
|
|
@@ -1117,7 +1117,7 @@
|
|
|
|
* This option is only useful if both MBEDTLS_SHA256_C and
|
|
|
|
* This option is only useful if both MBEDTLS_SHA256_C and
|
|
|
|
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
|
|
|
|
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -100,7 +100,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_ENTROPY_NV_SEED
|
|
|
|
* \def MBEDTLS_ENTROPY_NV_SEED
|
|
|
|
@@ -1170,14 +1170,14 @@
|
|
|
|
@@ -1212,14 +1212,14 @@
|
|
|
|
* Uncomment this macro to disable the use of CRT in RSA.
|
|
|
|
* Uncomment this macro to disable the use of CRT in RSA.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -117,7 +117,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_SHA256_SMALLER
|
|
|
|
* \def MBEDTLS_SHA256_SMALLER
|
|
|
|
@@ -1331,7 +1331,7 @@
|
|
|
|
@@ -1373,7 +1373,7 @@
|
|
|
|
* configuration of this extension).
|
|
|
|
* configuration of this extension).
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -126,7 +126,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
|
|
|
|
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
|
|
|
|
@@ -1506,7 +1506,7 @@
|
|
|
|
@@ -1548,7 +1548,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Comment this macro to disable support for SSL session tickets
|
|
|
|
* Comment this macro to disable support for SSL session tickets
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -135,7 +135,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_SSL_EXPORT_KEYS
|
|
|
|
* \def MBEDTLS_SSL_EXPORT_KEYS
|
|
|
|
@@ -1536,7 +1536,7 @@
|
|
|
|
@@ -1578,7 +1578,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Comment this macro to disable support for truncated HMAC in SSL
|
|
|
|
* Comment this macro to disable support for truncated HMAC in SSL
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -144,7 +144,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
|
|
|
|
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
|
|
|
|
@@ -1595,7 +1595,7 @@
|
|
|
|
@@ -1637,7 +1637,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Comment this to disable run-time checking and save ROM space
|
|
|
|
* Comment this to disable run-time checking and save ROM space
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -153,7 +153,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
|
|
|
|
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
|
|
|
|
@@ -1925,7 +1925,7 @@
|
|
|
|
@@ -1967,7 +1967,7 @@
|
|
|
|
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
|
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -162,7 +162,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_ARIA_C
|
|
|
|
* \def MBEDTLS_ARIA_C
|
|
|
|
@@ -1991,7 +1991,7 @@
|
|
|
|
@@ -2033,7 +2033,7 @@
|
|
|
|
* This module enables the AES-CCM ciphersuites, if other requisites are
|
|
|
|
* This module enables the AES-CCM ciphersuites, if other requisites are
|
|
|
|
* enabled as well.
|
|
|
|
* enabled as well.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -171,7 +171,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_CERTS_C
|
|
|
|
* \def MBEDTLS_CERTS_C
|
|
|
|
@@ -2003,7 +2003,7 @@
|
|
|
|
@@ -2045,7 +2045,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* This module is used for testing (ssl_client/server).
|
|
|
|
* This module is used for testing (ssl_client/server).
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -180,7 +180,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_CHACHA20_C
|
|
|
|
* \def MBEDTLS_CHACHA20_C
|
|
|
|
@@ -2078,7 +2078,7 @@
|
|
|
|
@@ -2120,7 +2120,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* This module provides debugging functions.
|
|
|
|
* This module provides debugging functions.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -189,7 +189,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_DES_C
|
|
|
|
* \def MBEDTLS_DES_C
|
|
|
|
@@ -2107,7 +2107,7 @@
|
|
|
|
@@ -2149,7 +2149,7 @@
|
|
|
|
* \warning DES is considered a weak cipher and its use constitutes a
|
|
|
|
* \warning DES is considered a weak cipher and its use constitutes a
|
|
|
|
* security risk. We recommend considering stronger ciphers instead.
|
|
|
|
* security risk. We recommend considering stronger ciphers instead.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -198,7 +198,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_DHM_C
|
|
|
|
* \def MBEDTLS_DHM_C
|
|
|
|
@@ -2270,7 +2270,7 @@
|
|
|
|
@@ -2312,7 +2312,7 @@
|
|
|
|
* This module adds support for the Hashed Message Authentication Code
|
|
|
|
* This module adds support for the Hashed Message Authentication Code
|
|
|
|
* (HMAC)-based key derivation function (HKDF).
|
|
|
|
* (HMAC)-based key derivation function (HKDF).
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -207,7 +207,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_HMAC_DRBG_C
|
|
|
|
* \def MBEDTLS_HMAC_DRBG_C
|
|
|
|
@@ -2580,7 +2580,7 @@
|
|
|
|
@@ -2622,7 +2622,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* This module enables abstraction of common (libc) functions.
|
|
|
|
* This module enables abstraction of common (libc) functions.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -216,7 +216,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_POLY1305_C
|
|
|
|
* \def MBEDTLS_POLY1305_C
|
|
|
|
@@ -2601,7 +2601,7 @@
|
|
|
|
@@ -2643,7 +2643,7 @@
|
|
|
|
* Caller: library/md.c
|
|
|
|
* Caller: library/md.c
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -225,7 +225,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_RSA_C
|
|
|
|
* \def MBEDTLS_RSA_C
|
|
|
|
@@ -2708,7 +2708,7 @@
|
|
|
|
@@ -2750,7 +2750,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Requires: MBEDTLS_CIPHER_C
|
|
|
|
* Requires: MBEDTLS_CIPHER_C
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -234,7 +234,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_SSL_CLI_C
|
|
|
|
* \def MBEDTLS_SSL_CLI_C
|
|
|
|
@@ -2808,7 +2808,7 @@
|
|
|
|
@@ -2850,7 +2850,7 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* This module provides run-time version information.
|
|
|
|
* This module provides run-time version information.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -243,7 +243,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* \def MBEDTLS_X509_USE_C
|
|
|
|
* \def MBEDTLS_X509_USE_C
|
|
|
|
@@ -2918,7 +2918,7 @@
|
|
|
|
@@ -2960,7 +2960,7 @@
|
|
|
|
* Module: library/xtea.c
|
|
|
|
* Module: library/xtea.c
|
|
|
|
* Caller:
|
|
|
|
* Caller:
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|