aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/tls_handshake.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-03-10 15:40:37 +0100
committerIngela Anderton Andin <[email protected]>2015-03-23 09:04:51 +0100
commitd3df580ae275751f541ff6d55c0ba532e166fb70 (patch)
treee6acc2631e5b47866426526ec1520123603f84a9 /lib/ssl/src/tls_handshake.erl
parent54e1779b5a94bc2662e38fff18ad621228aa75c0 (diff)
downloadotp-d3df580ae275751f541ff6d55c0ba532e166fb70.tar.gz
otp-d3df580ae275751f541ff6d55c0ba532e166fb70.tar.bz2
otp-d3df580ae275751f541ff6d55c0ba532e166fb70.zip
ssl: Dialyzer fixes
Diffstat (limited to 'lib/ssl/src/tls_handshake.erl')
-rw-r--r--lib/ssl/src/tls_handshake.erl11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl
index 2d50dd7e46..d936310991 100644
--- a/lib/ssl/src/tls_handshake.erl
+++ b/lib/ssl/src/tls_handshake.erl
@@ -78,11 +78,14 @@ client_hello(Host, Port, ConnectionStates,
%%--------------------------------------------------------------------
-spec hello(#server_hello{} | #client_hello{}, #ssl_options{},
#connection_states{} | {inet:port_number(), #session{}, db_handle(),
- atom(), #connection_states{}, binary() | undefined},
+ atom(), #connection_states{},
+ binary() | undefined},
boolean()) ->
- {tls_record:tls_version(), session_id(), #connection_states{}, binary() | undefined}|
- {tls_record:tls_version(), {resumed | new, #session{}}, #connection_states{},
- #hello_extensions{}} |
+ {tls_record:tls_version(), session_id(),
+ #connection_states{}, alpn | npn, binary() | undefined}|
+ {tls_record:tls_version(), {resumed | new, #session{}},
+ #connection_states{}, binary() | undefined,
+ #hello_extensions{}} |
#alert{}.
%%
%% Description: Handles a recieved hello message