mbedtls: update to 2.6.0 CVE-2017-14032
[openwrt/openwrt.git] / package / libs / mbedtls / patches / 200-config.patch
1 --- a/include/mbedtls/config.h
2 +++ b/include/mbedtls/config.h
3 @@ -220,7 +220,7 @@
4 *
5 * Uncomment to get errors on using deprecated functions.
6 */
7 -//#define MBEDTLS_DEPRECATED_REMOVED
8 +#define MBEDTLS_DEPRECATED_REMOVED
9
10 /* \} name SECTION: System support */
11
12 @@ -539,17 +539,17 @@
13 *
14 * Comment macros to disable the curve and functions for it
15 */
16 -#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
17 -#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
18 +//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
19 +//#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
20 #define MBEDTLS_ECP_DP_SECP256R1_ENABLED
21 #define MBEDTLS_ECP_DP_SECP384R1_ENABLED
22 -#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
23 -#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
24 -#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
25 +//#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
26 +//#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
27 +//#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
28 #define MBEDTLS_ECP_DP_SECP256K1_ENABLED
29 -#define MBEDTLS_ECP_DP_BP256R1_ENABLED
30 -#define MBEDTLS_ECP_DP_BP384R1_ENABLED
31 -#define MBEDTLS_ECP_DP_BP512R1_ENABLED
32 +//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
33 +//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
34 +//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
35 #define MBEDTLS_ECP_DP_CURVE25519_ENABLED
36
37 /**
38 @@ -574,8 +574,8 @@
39 * Requires: MBEDTLS_HMAC_DRBG_C
40 *
41 * Comment this macro to disable deterministic ECDSA.
42 - */
43 #define MBEDTLS_ECDSA_DETERMINISTIC
44 + */
45
46 /**
47 * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
48 @@ -621,7 +621,7 @@
49 * MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
50 * MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
51 */
52 -#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
53 +//#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
54
55 /**
56 * \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
57 @@ -640,8 +640,8 @@
58 * MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
59 * MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
60 * MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
61 - */
62 #define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
63 + */
64
65 /**
66 * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
67 @@ -666,7 +666,7 @@
68 * MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
69 * MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
70 */
71 -#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
72 +//#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
73
74 /**
75 * \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
76 @@ -793,7 +793,7 @@
77 * MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
78 * MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
79 */
80 -#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
81 +//#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
82
83 /**
84 * \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
85 @@ -817,7 +817,7 @@
86 * MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
87 * MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
88 */
89 -#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
90 +//#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
91
92 /**
93 * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
94 @@ -921,7 +921,7 @@
95 * This option is only useful if both MBEDTLS_SHA256_C and
96 * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
97 */
98 -//#define MBEDTLS_ENTROPY_FORCE_SHA256
99 +#define MBEDTLS_ENTROPY_FORCE_SHA256
100
101 /**
102 * \def MBEDTLS_ENTROPY_NV_SEED
103 @@ -1015,14 +1015,14 @@
104 * Uncomment this macro to disable the use of CRT in RSA.
105 *
106 */
107 -//#define MBEDTLS_RSA_NO_CRT
108 +#define MBEDTLS_RSA_NO_CRT
109
110 /**
111 * \def MBEDTLS_SELF_TEST
112 *
113 * Enable the checkup functions (*_self_test).
114 */
115 -#define MBEDTLS_SELF_TEST
116 +//#define MBEDTLS_SELF_TEST
117
118 /**
119 * \def MBEDTLS_SHA256_SMALLER
120 @@ -1038,7 +1038,7 @@
121 *
122 * Uncomment to enable the smaller implementation of SHA256.
123 */
124 -//#define MBEDTLS_SHA256_SMALLER
125 +#define MBEDTLS_SHA256_SMALLER
126
127 /**
128 * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
129 @@ -1157,8 +1157,8 @@
130 * misuse/misunderstand.
131 *
132 * Comment this to disable support for renegotiation.
133 - */
134 #define MBEDTLS_SSL_RENEGOTIATION
135 + */
136
137 /**
138 * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
139 @@ -1332,8 +1332,8 @@
140 * callbacks are provided by MBEDTLS_SSL_TICKET_C.
141 *
142 * Comment this macro to disable support for SSL session tickets
143 - */
144 #define MBEDTLS_SSL_SESSION_TICKETS
145 + */
146
147 /**
148 * \def MBEDTLS_SSL_EXPORT_KEYS
149 @@ -1363,7 +1363,7 @@
150 *
151 * Comment this macro to disable support for truncated HMAC in SSL
152 */
153 -#define MBEDTLS_SSL_TRUNCATED_HMAC
154 +//#define MBEDTLS_SSL_TRUNCATED_HMAC
155
156 /**
157 * \def MBEDTLS_THREADING_ALT
158 @@ -1397,8 +1397,8 @@
159 * Requires: MBEDTLS_VERSION_C
160 *
161 * Comment this to disable run-time checking and save ROM space
162 - */
163 #define MBEDTLS_VERSION_FEATURES
164 + */
165
166 /**
167 * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
168 @@ -1719,7 +1719,7 @@
169 * MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
170 * MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
171 */
172 -#define MBEDTLS_CAMELLIA_C
173 +//#define MBEDTLS_CAMELLIA_C
174
175 /**
176 * \def MBEDTLS_CCM_C
177 @@ -1733,7 +1733,7 @@
178 * This module enables the AES-CCM ciphersuites, if other requisites are
179 * enabled as well.
180 */
181 -#define MBEDTLS_CCM_C
182 +//#define MBEDTLS_CCM_C
183
184 /**
185 * \def MBEDTLS_CERTS_C
186 @@ -1745,7 +1745,7 @@
187 *
188 * This module is used for testing (ssl_client/server).
189 */
190 -#define MBEDTLS_CERTS_C
191 +//#define MBEDTLS_CERTS_C
192
193 /**
194 * \def MBEDTLS_CIPHER_C
195 @@ -1798,7 +1798,7 @@
196 *
197 * This module provides debugging functions.
198 */
199 -#define MBEDTLS_DEBUG_C
200 +//#define MBEDTLS_DEBUG_C
201
202 /**
203 * \def MBEDTLS_DES_C
204 @@ -1823,8 +1823,8 @@
205 * MBEDTLS_TLS_PSK_WITH_3DES_EDE_CBC_SHA
206 *
207 * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
208 - */
209 #define MBEDTLS_DES_C
210 + */
211
212 /**
213 * \def MBEDTLS_DHM_C
214 @@ -1978,8 +1978,8 @@
215 * Requires: MBEDTLS_MD_C
216 *
217 * Uncomment to enable the HMAC_DRBG random number geerator.
218 - */
219 #define MBEDTLS_HMAC_DRBG_C
220 + */
221
222 /**
223 * \def MBEDTLS_MD_C
224 @@ -2256,7 +2256,7 @@
225 * Caller: library/md.c
226 *
227 */
228 -#define MBEDTLS_RIPEMD160_C
229 +//#define MBEDTLS_RIPEMD160_C
230
231 /**
232 * \def MBEDTLS_RSA_C
233 @@ -2334,8 +2334,8 @@
234 * Caller:
235 *
236 * Requires: MBEDTLS_SSL_CACHE_C
237 - */
238 #define MBEDTLS_SSL_CACHE_C
239 + */
240
241 /**
242 * \def MBEDTLS_SSL_COOKIE_C
243 @@ -2356,8 +2356,8 @@
244 * Caller:
245 *
246 * Requires: MBEDTLS_CIPHER_C
247 - */
248 #define MBEDTLS_SSL_TICKET_C
249 + */
250
251 /**
252 * \def MBEDTLS_SSL_CLI_C
253 @@ -2456,8 +2456,8 @@
254 * Module: library/version.c
255 *
256 * This module provides run-time version information.
257 - */
258 #define MBEDTLS_VERSION_C
259 + */
260
261 /**
262 * \def MBEDTLS_X509_USE_C
263 @@ -2567,7 +2567,7 @@
264 * Module: library/xtea.c
265 * Caller:
266 */
267 -#define MBEDTLS_XTEA_C
268 +//#define MBEDTLS_XTEA_C
269
270 /* \} name SECTION: mbed TLS modules */
271