Skip to content

Commit 73e81a8

Browse files
mkrknjow-
authored andcommitted
mbedtls: update to 2.5.1
Fixes some security issues (no remote exploits), and introduces some changes. See release notes for details: https://tls.mbed.org/tech-updates/releases/mbedtls-2.5.1-2.1.8-and-1.3.20-released * Fixes an unlimited overread of heap-based buffers in mbedtls_ssl_read() * Adds exponent blinding to RSA private operations * Wipes stack buffers in RSA private key operations (rsa_rsaes_pkcs1_v15_decrypt(), rsa_rsaes_oaep_decrypt()) * Removes SHA-1 and RIPEMD-160 from the default hash algorithms for certificate verification. * Fixes offset in FALLBACK_SCSV parsing that caused TLS server to fail to detect it sometimes. * Tighten parsing of RSA PKCS#1 v1.5 signatures, to avoid a potential Bleichenbacher/BERserk-style attack. Signed-off-by: Magnus Kroken <[email protected]>
1 parent 5b0b27e commit 73e81a8

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

package/libs/mbedtls/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=mbedtls
11-
PKG_VERSION:=2.4.2
11+
PKG_VERSION:=2.5.1
1212
PKG_RELEASE:=1
1313
PKG_USE_MIPS16:=0
1414

1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
1616
PKG_SOURCE_URL:=https://tls.mbed.org/download/
17-
PKG_HASH:=d01f2d5586a52055329d194d909103f445bd2d0b6b2b5f1c830fbf828ac6299f
17+
PKG_HASH:=312f020006f0d8e9ede3ed8e73d907a629baf6475229703941769372ab0adee2
1818

1919
PKG_BUILD_PARALLEL:=1
2020
PKG_LICENSE:=GPL-2.0+

package/libs/mbedtls/patches/200-config.patch

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/* \} name SECTION: System support */
1111

12-
@@ -441,17 +441,17 @@
12+
@@ -504,17 +504,17 @@
1313
*
1414
* Comment macros to disable the curve and functions for it
1515
*/
@@ -35,7 +35,7 @@
3535
#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
3636

3737
/**
38-
@@ -476,8 +476,8 @@
38+
@@ -539,8 +539,8 @@
3939
* Requires: MBEDTLS_HMAC_DRBG_C
4040
*
4141
* Comment this macro to disable deterministic ECDSA.
@@ -45,7 +45,7 @@
4545

4646
/**
4747
* \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
48-
@@ -523,7 +523,7 @@
48+
@@ -586,7 +586,7 @@
4949
* MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
5050
* MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
5151
*/
@@ -54,7 +54,7 @@
5454

5555
/**
5656
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
57-
@@ -542,8 +542,8 @@
57+
@@ -605,8 +605,8 @@
5858
* MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
5959
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
6060
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
@@ -64,7 +64,7 @@
6464

6565
/**
6666
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
67-
@@ -568,7 +568,7 @@
67+
@@ -631,7 +631,7 @@
6868
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
6969
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
7070
*/
@@ -73,7 +73,7 @@
7373

7474
/**
7575
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
76-
@@ -695,7 +695,7 @@
76+
@@ -758,7 +758,7 @@
7777
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
7878
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
7979
*/
@@ -82,7 +82,7 @@
8282

8383
/**
8484
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
85-
@@ -719,7 +719,7 @@
85+
@@ -782,7 +782,7 @@
8686
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
8787
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
8888
*/
@@ -91,7 +91,7 @@
9191

9292
/**
9393
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
94-
@@ -823,7 +823,7 @@
94+
@@ -886,7 +886,7 @@
9595
* This option is only useful if both MBEDTLS_SHA256_C and
9696
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
9797
*/
@@ -100,7 +100,7 @@
100100

101101
/**
102102
* \def MBEDTLS_ENTROPY_NV_SEED
103-
@@ -917,14 +917,14 @@
103+
@@ -980,14 +980,14 @@
104104
* Uncomment this macro to disable the use of CRT in RSA.
105105
*
106106
*/
@@ -117,7 +117,7 @@
117117

118118
/**
119119
* \def MBEDTLS_SHA256_SMALLER
120-
@@ -940,7 +940,7 @@
120+
@@ -1003,7 +1003,7 @@
121121
*
122122
* Uncomment to enable the smaller implementation of SHA256.
123123
*/
@@ -126,7 +126,7 @@
126126

127127
/**
128128
* \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
129-
@@ -1059,8 +1059,8 @@
129+
@@ -1122,8 +1122,8 @@
130130
* misuse/misunderstand.
131131
*
132132
* Comment this to disable support for renegotiation.
@@ -136,7 +136,7 @@
136136

137137
/**
138138
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
139-
@@ -1234,8 +1234,8 @@
139+
@@ -1297,8 +1297,8 @@
140140
* callbacks are provided by MBEDTLS_SSL_TICKET_C.
141141
*
142142
* Comment this macro to disable support for SSL session tickets
@@ -146,7 +146,7 @@
146146

147147
/**
148148
* \def MBEDTLS_SSL_EXPORT_KEYS
149-
@@ -1265,7 +1265,7 @@
149+
@@ -1328,7 +1328,7 @@
150150
*
151151
* Comment this macro to disable support for truncated HMAC in SSL
152152
*/
@@ -155,7 +155,7 @@
155155

156156
/**
157157
* \def MBEDTLS_THREADING_ALT
158-
@@ -1299,8 +1299,8 @@
158+
@@ -1362,8 +1362,8 @@
159159
* Requires: MBEDTLS_VERSION_C
160160
*
161161
* Comment this to disable run-time checking and save ROM space
@@ -165,7 +165,7 @@
165165

166166
/**
167167
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
168-
@@ -1621,7 +1621,7 @@
168+
@@ -1684,7 +1684,7 @@
169169
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
170170
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
171171
*/
@@ -174,7 +174,7 @@
174174

175175
/**
176176
* \def MBEDTLS_CCM_C
177-
@@ -1635,7 +1635,7 @@
177+
@@ -1698,7 +1698,7 @@
178178
* This module enables the AES-CCM ciphersuites, if other requisites are
179179
* enabled as well.
180180
*/
@@ -183,7 +183,7 @@
183183

184184
/**
185185
* \def MBEDTLS_CERTS_C
186-
@@ -1647,7 +1647,7 @@
186+
@@ -1710,7 +1710,7 @@
187187
*
188188
* This module is used for testing (ssl_client/server).
189189
*/
@@ -192,7 +192,7 @@
192192

193193
/**
194194
* \def MBEDTLS_CIPHER_C
195-
@@ -1700,7 +1700,7 @@
195+
@@ -1763,7 +1763,7 @@
196196
*
197197
* This module provides debugging functions.
198198
*/
@@ -201,7 +201,7 @@
201201

202202
/**
203203
* \def MBEDTLS_DES_C
204-
@@ -1725,8 +1725,8 @@
204+
@@ -1788,8 +1788,8 @@
205205
* MBEDTLS_TLS_PSK_WITH_3DES_EDE_CBC_SHA
206206
*
207207
* PEM_PARSE uses DES/3DES for decrypting encrypted keys.
@@ -211,7 +211,7 @@
211211

212212
/**
213213
* \def MBEDTLS_DHM_C
214-
@@ -1880,8 +1880,8 @@
214+
@@ -1943,8 +1943,8 @@
215215
* Requires: MBEDTLS_MD_C
216216
*
217217
* Uncomment to enable the HMAC_DRBG random number geerator.
@@ -221,7 +221,7 @@
221221

222222
/**
223223
* \def MBEDTLS_MD_C
224-
@@ -2158,7 +2158,7 @@
224+
@@ -2221,7 +2221,7 @@
225225
* Caller: library/md.c
226226
*
227227
*/
@@ -230,7 +230,7 @@
230230

231231
/**
232232
* \def MBEDTLS_RSA_C
233-
@@ -2235,8 +2235,8 @@
233+
@@ -2299,8 +2299,8 @@
234234
* Caller:
235235
*
236236
* Requires: MBEDTLS_SSL_CACHE_C
@@ -240,7 +240,7 @@
240240

241241
/**
242242
* \def MBEDTLS_SSL_COOKIE_C
243-
@@ -2257,8 +2257,8 @@
243+
@@ -2321,8 +2321,8 @@
244244
* Caller:
245245
*
246246
* Requires: MBEDTLS_CIPHER_C
@@ -250,7 +250,7 @@
250250

251251
/**
252252
* \def MBEDTLS_SSL_CLI_C
253-
@@ -2357,8 +2357,8 @@
253+
@@ -2421,8 +2421,8 @@
254254
* Module: library/version.c
255255
*
256256
* This module provides run-time version information.
@@ -260,7 +260,7 @@
260260

261261
/**
262262
* \def MBEDTLS_X509_USE_C
263-
@@ -2468,7 +2468,7 @@
263+
@@ -2532,7 +2532,7 @@
264264
* Module: library/xtea.c
265265
* Caller:
266266
*/

0 commit comments

Comments
 (0)