diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-23 16:09:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-23 16:09:14 +0200 |
| commit | 487f0c12e8700d31161a3bbb9c36e360aff484ac (patch) | |
| tree | d8913e75f104c55ce0da9f42196a5b7bb1d0890f /lib | |
| parent | 74b745494dfa7ef091c0b59dee284606f3d23ce3 (diff) | |
| parent | 4c2c629f3a4633ba291da292b194f5c632b7a310 (diff) | |
| download | otp-487f0c12e8700d31161a3bbb9c36e360aff484ac.tar.gz otp-487f0c12e8700d31161a3bbb9c36e360aff484ac.tar.bz2 otp-487f0c12e8700d31161a3bbb9c36e360aff484ac.zip | |
Merge branch 'ingela/ssl/correct-specs' into maint
* ingela/ssl/correct-specs:
ssl: Correct dialyzer specs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_api.hrl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_v3.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_api.hrl b/lib/ssl/src/ssl_api.hrl index 2bd51cf91e..144323c572 100644 --- a/lib/ssl/src/ssl_api.hrl +++ b/lib/ssl/src/ssl_api.hrl @@ -57,7 +57,7 @@ -type verify_type() :: verify_none | verify_peer. -type path() :: string(). --type ciphers() :: [ssl_cipher:erl_cipher_suite()] | +-type ciphers() :: [ssl_cipher_format:erl_cipher_suite()] | string(). % (according to old API) -type ssl_imp() :: new | old. diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index 811aa779d5..9cef0c9605 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -59,7 +59,7 @@ negotiated_version :: ssl_record:ssl_version() | 'undefined', client_hello_version :: ssl_record:ssl_version() | 'undefined', client_certificate_requested = false :: boolean(), - key_algorithm :: ssl_cipher:key_algo(), + key_algorithm :: ssl_cipher_format:key_algo(), hashsign_algorithm = {undefined, undefined}, cert_hashsign_algorithm = {undefined, undefined}, public_key_info :: ssl_handshake:public_key_info() | 'undefined', diff --git a/lib/ssl/src/ssl_v3.erl b/lib/ssl/src/ssl_v3.erl index 82d165f995..7eebb1d45f 100644 --- a/lib/ssl/src/ssl_v3.erl +++ b/lib/ssl/src/ssl_v3.erl @@ -131,7 +131,7 @@ setup_keys(MasterSecret, ServerRandom, ClientRandom, HS, KML, _EKML, IVS) -> {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey, ServerWriteKey, ClientIV, ServerIV}. --spec suites() -> [ssl_cipher:cipher_suite()]. +-spec suites() -> [ssl_cipher_format:cipher_suite()]. suites() -> [ diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index d6b500748e..1bfd9a8b6d 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -192,7 +192,7 @@ mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor}, Fragment]), Mac. --spec suites(1|2|3) -> [ssl_cipher:cipher_suite()]. +-spec suites(1|2|3) -> [ssl_cipher_format:cipher_suite()]. suites(Minor) when Minor == 1; Minor == 2 -> [ |