| commit | 8a81e84638c17592d4fd3c3eac60875eaa2c06d2 | [log] [tgz] |
|---|---|---|
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Wed Apr 29 02:13:42 2015 +0200 |
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Wed Apr 29 02:13:42 2015 +0200 |
| tree | f929a06281a2500ea6432c1c132e554106af6bcd | |
| parent | 1e2eae02cbaa12db1437e895ec7c0a7665a60c89 [diff] | |
| parent | 47fede0d6db5a8c484fa61aaab3831b3cb4c364a [diff] |
Merge branch 'mbedtls-1.3' into development * mbedtls-1.3: Add countermeasure against cache-based lucky 13 Conflicts: library/ssl_tls.c