diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-05-06 16:17:56 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-05-08 10:39:23 +0200 |
| commit | 19d511a10d5e258b8f2f876f7c12ffbf35174d89 (patch) | |
| tree | 800665a97cec32d894b822b0c9d3b4eeb7d51f8e | |
| parent | cadab5a955d2db70d42d9e8e9c9658ad3a46d472 (diff) | |
| download | otp-19d511a10d5e258b8f2f876f7c12ffbf35174d89.tar.gz otp-19d511a10d5e258b8f2f876f7c12ffbf35174d89.tar.bz2 otp-19d511a10d5e258b8f2f876f7c12ffbf35174d89.zip | |
ssl: Fix dialyzer spec
| -rw-r--r-- | lib/ssl/src/ssl_cipher.hrl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl index 32b2c0d392..c7c71ee1a7 100644 --- a/lib/ssl/src/ssl_cipher.hrl +++ b/lib/ssl/src/ssl_cipher.hrl @@ -30,7 +30,7 @@ | aes_128_cbc | aes_256_cbc. -type hash() :: null | sha | md5 | ssh224 | sha256 | sha384 | sha512. -type erl_cipher_suite() :: {key_algo(), cipher(), hash()}. --type int_cipher_suite() :: {key_algo(), cipher(), hash(), hash()}. +-type int_cipher_suite() :: {key_algo(), cipher(), hash(), hash() | default_prf}. -type cipher_suite() :: binary(). -type cipher_enum() :: integer(). -type openssl_cipher_suite() :: string(). diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 89fee38c46..14db4a6067 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -37,7 +37,7 @@ -type tls_atom_version() :: sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'. -type certdb_ref() :: reference(). -type db_handle() :: term(). --type key_algo() :: null | rsa | dhe_rsa | dhe_dss | dh_anon. +-type key_algo() :: null | rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon. -type der_cert() :: binary(). -type private_key() :: #'RSAPrivateKey'{} | #'DSAPrivateKey'{} | #'ECPrivateKey'{}. -type issuer() :: tuple(). |