aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/tls_handshake.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-03-13 15:28:52 +0100
committerIngela Anderton Andin <[email protected]>2015-03-13 15:28:52 +0100
commitd311a090908521f1a9b131c1bd12582d3ef2aaf3 (patch)
tree97a1486f4093862a0278938acdcb1317f4b944fb /lib/ssl/src/tls_handshake.erl
parent0b5ae3e554c7c1220281df138fb0cefb76860427 (diff)
parentb65d8b7ba72a42cfe5df28577433e553d2c0f4ca (diff)
downloadotp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.tar.gz
otp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.tar.bz2
otp-d311a090908521f1a9b131c1bd12582d3ef2aaf3.zip
Merge branch 'ia/ssl/crls-dialyzer'
* ia/ssl/crls-dialyzer: ssl: Dialyzer fixes
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
-rw-r--r--lib/ssl/src/tls_handshake.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl
index b0b6d5a8e3..548ec4aebe 100644
--- a/lib/ssl/src/tls_handshake.erl
+++ b/lib/ssl/src/tls_handshake.erl
@@ -82,8 +82,7 @@ client_hello(Host, Port, ConnectionStates,
boolean()) ->
{tls_record:tls_version(), session_id(), #connection_states{}, binary() | undefined}|
{tls_record:tls_version(), {resumed | new, #session{}}, #connection_states{},
- [binary()] | undefined,
- [ssl_handshake:oid()] | undefined, [ssl_handshake:oid()] | undefined} |
+ #hello_extensions{}} |
#alert{}.
%%
%% Description: Handles a recieved hello message