diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-10-14 12:17:25 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-10-14 12:17:25 +0200 |
| commit | f13b2362c665ef2d98858a4601b1fecf31a21bb5 (patch) | |
| tree | 7070f02f170b0f8fa2b19819fc77df125a863e4a /lib/ssl/src/ssl_handshake.hrl | |
| parent | a0217458309211c35423738df5044fe8abf055ea (diff) | |
| parent | bcff09db98ba696b757139a3fd16050a255182e2 (diff) | |
| download | otp-f13b2362c665ef2d98858a4601b1fecf31a21bb5.tar.gz otp-f13b2362c665ef2d98858a4601b1fecf31a21bb5.tar.bz2 otp-f13b2362c665ef2d98858a4601b1fecf31a21bb5.zip | |
Merge branch 'ia/ssl/ecc-gnutls/OTP-11370' into maint
* ia/ssl/ecc-gnutls/OTP-11370:
ssl: Fix dialyzer spec
ssl: Honor TLS client ECC extension
Diffstat (limited to 'lib/ssl/src/ssl_handshake.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl index 3a3ad8cf35..f25b0df806 100644 --- a/lib/ssl/src/ssl_handshake.hrl +++ b/lib/ssl/src/ssl_handshake.hrl @@ -45,7 +45,8 @@ master_secret, srp_username, is_resumable, - time_stamp + time_stamp, + ecc }). -define(NUM_OF_SESSION_ID_BYTES, 32). % TSL 1.1 & SSL 3 |