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 | |
| 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')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 1 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 3 | ||||
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index fed7aa1141..d06f61f17d 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -87,6 +87,7 @@ private_key_type/0, cipher/0, hash/0, + key/0, key_algo/0, sign_algo/0 ]). diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 085a045169..3d117a655f 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -122,7 +122,8 @@ cert :: public_key:der_encoded() | secret_printout() | 'undefined', keyfile :: binary(), key :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', - public_key:der_encoded()} | ssl:key() | secret_printout() | 'undefined', + public_key:der_encoded()} | map() %%map() -> ssl:key() how to handle dialyzer? + | secret_printout() | 'undefined', password :: string() | secret_printout() | 'undefined', cacerts :: [public_key:der_encoded()] | secret_printout() | 'undefined', cacertfile :: binary(), 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 |