| commit | 56d985d0a64685e4c062b6a385f6ba10e003181d | [log] [download] |
|---|---|---|
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Thu Nov 06 01:25:09 2014 +0100 |
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Thu Nov 06 01:25:09 2014 +0100 |
| tree | f665b0e9ccca6e4c15089b05550cae90b708a579 | |
| parent | fedba98ede04cc6c22c08b94940eccf80da7e6e3 [diff] | |
| parent | b3c6a97b31eebbd8867f1ee99e54d34fb9028d85 [diff] |
Merge branch 'session-hash' into dtls * session-hash: Update Changelog for session-hash Make session-hash depend on TLS versions Forbid extended master secret with SSLv3 compat.sh: allow git version of gnutls compat.sh: make options a bit more robust Implement extended master secret Add negotiation of Extended Master Secret Conflicts: include/polarssl/check_config.h programs/ssl/ssl_server2.c