diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-18 16:59:41 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-18 17:35:07 +0100 |
| commit | 90885d08ccfc2cad4ba87f5a85decc979de56702 (patch) | |
| tree | 8ec8bbb822610bd98e3a9e933e2dd8873f8e7f7e /lib/ssl/src/tls_connection.erl | |
| parent | fde162310c3fab0fea924b005a383129acf569c9 (diff) | |
| download | otp-90885d08ccfc2cad4ba87f5a85decc979de56702.tar.gz otp-90885d08ccfc2cad4ba87f5a85decc979de56702.tar.bz2 otp-90885d08ccfc2cad4ba87f5a85decc979de56702.zip | |
ssl: Correct merge commit thanks to dialyzer
Also make a weaker spec in ssl_internal.hrl for now as it creates
a conflict between error handling and dialyzer warnings.
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index a47caed410..ebb723673e 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -587,8 +587,8 @@ hello(internal, #client_hello{client_version = ClientVersion} = Hello, Renegotiation) of #alert{} = Alert -> ssl_connection:handle_own_alert(Alert, ClientVersion, hello, - State#state{connection_env = #connection_env{negotiated_version - = ClientVersion}}); + State#state{connection_env = CEnv#connection_env{negotiated_version + = ClientVersion}}); {Version, {Type, Session}, ConnectionStates, Protocol0, ServerHelloExt, HashSign} -> Protocol = case Protocol0 of |