| commit | f9d778d6352f8d6bcaac65e8985f07cd4df4ae11 | [log] [download] |
|---|---|---|
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Thu Nov 06 01:36:32 2014 +0100 |
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Thu Nov 06 01:36:32 2014 +0100 |
| tree | 6b3b677c14c8720a1db0f49b5abc94fd1ed9a5b5 | |
| parent | 56d985d0a64685e4c062b6a385f6ba10e003181d [diff] | |
| parent | 9d7821d774ebeb4256463f08abfb93910a376ef1 [diff] |
Merge branch 'etm' into dtls * etm: Fix warning in reduced config Update Changelog for EtM Keep EtM state across renegotiations Adjust minimum length for EtM Don't send back EtM extension if not using CBC Fix for the RFC erratum Implement EtM Preparation for EtM Implement initial negotiation of EtM Conflicts: include/polarssl/check_config.h