| commit | 7cfbaf05b3f36debb949956168c4d4e6b589a6a3 | [log] [download] |
|---|---|---|
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Fri Apr 24 14:10:04 2015 +0200 |
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Fri Apr 24 14:10:04 2015 +0200 |
| tree | 90125234f50eeaf7243b9b83260e476873cfd532 | |
| parent | 331ba5778a21c8295d4350bdd05b32ffb567e8a2 [diff] | |
| parent | 9ce1bdc1519d1b0571383064a79bc55f9adc4b8f [diff] |
Merge branch 'mbedtls-1.3' into development * mbedtls-1.3: Fix bugs in programs displaying verify flags Conflicts: programs/test/ssl_cert_test.c programs/x509/cert_app.c