| commit | 144bc224e978bea0f667ebff647683c14c120d3f | [log] [download] |
|---|---|---|
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Fri Apr 17 20:39:07 2015 +0200 |
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Fri Apr 17 20:39:07 2015 +0200 |
| tree | 8780124c5699e3088ece62eca2cf5412ee6bf05f | |
| parent | 53c76c07de26b0541321a87d6ec60061a638b042 [diff] | |
| parent | a2fce21ae5b5bd74c66e305f864ff5875cf9df81 [diff] |
Merge branch 'mbedtls-1.3' into development * commit 'a2fce21': Fix potential NULL dereference on bad usage Conflicts: library/ssl_tls.c