| commit | b5212b436f113b90fb64108e1549697c6232db7f | [log] [download] |
|---|---|---|
| author | Paul Bakker <p.j.bakker@polarssl.org> | Thu May 22 15:30:31 2014 +0200 |
| committer | Paul Bakker <p.j.bakker@polarssl.org> | Thu May 22 15:30:31 2014 +0200 |
| tree | e74d9c8f8584094199b0ffb138cf7ed0c6f225e0 | |
| parent | 0f651c7422f288dd560901480457756443e73f8e [diff] | |
| parent | 64a96ea2817db3ced0a9b2c0a4f8331178143352 [diff] |
Merge CCM cipher mode and ciphersuites Conflicts: library/ssl_tls.c