diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-14 09:18:37 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-14 09:18:37 +0100 |
| commit | 668d3cf8e1346695c8e9e58e658eb3bbe4f57a5a (patch) | |
| tree | 3b6a7ee3ed967bed023068b8cb2a0c06a75c7cce /lib/ssl/src | |
| parent | 7d9d88e9adf040a17c8ffb01b069fb2a5d125dab (diff) | |
| parent | 745159c619dbcb53a54acab3d3482311439a57fc (diff) | |
| download | otp-668d3cf8e1346695c8e9e58e658eb3bbe4f57a5a.tar.gz otp-668d3cf8e1346695c8e9e58e658eb3bbe4f57a5a.tar.bz2 otp-668d3cf8e1346695c8e9e58e658eb3bbe4f57a5a.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index a468c131ce..b2b85eaf8d 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -212,7 +212,7 @@ hello(Hello = #client_hello{client_version = ClientVersion, client_ecc = {EllipticCurves, EcPointFormats}, negotiated_protocol = Protocol}, ?MODULE) end; -hello(Hello, +hello(Hello = #server_hello{}, #state{connection_states = ConnectionStates0, negotiated_version = ReqVersion, role = client, |