diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-03-26 09:31:53 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-26 09:31:53 +0100 |
| commit | fe4bb3563b4f52662cdf16c3b803b6ed255491c4 (patch) | |
| tree | aa011849dd36f33a3253e6f41df38048507233cb /lib/ssl/src/ssl_internal.hrl | |
| parent | e33a2eb094416740e4862dcbb6e6e118f50a41d2 (diff) | |
| parent | c2aab88300a61960a38b6ca33d64c9fae39989b3 (diff) | |
| download | otp-fe4bb3563b4f52662cdf16c3b803b6ed255491c4.tar.gz otp-fe4bb3563b4f52662cdf16c3b803b6ed255491c4.tar.bz2 otp-fe4bb3563b4f52662cdf16c3b803b6ed255491c4.zip | |
Merge branch 'ia/ssl/continue-dtls-and-specs'
* ia/ssl/continue-dtls-and-specs:
ssl: Avoid dialyzer warnings in dtls code
ssl: Improve type specs
ssl: Refactor and start implementing dtls_connection.erl
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 64b89e9f95..cec5d8fbb1 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -30,8 +30,6 @@ -type from() :: term(). -type host() :: inet:ip_address() | inet:hostname(). -type session_id() :: 0 | binary(). --type tls_version() :: {integer(), integer()}. --type tls_atom_version() :: sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'. -type certdb_ref() :: reference(). -type db_handle() :: term(). -type der_cert() :: binary(). @@ -73,7 +71,7 @@ -record(ssl_options, { protocol :: tls | dtls, - versions :: ['tlsv1.2' | 'tlsv1.1' | tlsv1 | sslv3] | ['dtlsv1.2' | dtlsv1], + versions :: [ssl_record:ssl_version()], %% ssl_record:atom_version() in API verify :: verify_none | verify_peer, verify_fun, %%:: fun(CertVerifyErrors::term()) -> boolean(), fail_if_no_peer_cert :: boolean(), |