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_cipher.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_cipher.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.hrl | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl index 62a5269def..3ce9c19aa9 100644 --- a/lib/ssl/src/ssl_cipher.hrl +++ b/lib/ssl/src/ssl_cipher.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2013. All Rights Reserved. +%% Copyright Ericsson AB 2007-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -26,16 +26,6 @@ -ifndef(ssl_cipher). -define(ssl_cipher, true). --type cipher() :: null |rc4_128 | idea_cbc | des40_cbc | des_cbc | '3des_ede_cbc' - | aes_128_cbc | aes_256_cbc. --type hash() :: null | sha | md5 | sha224 | sha256 | sha384 | sha512. --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 erl_cipher_suite() :: {key_algo(), cipher(), 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(). - %%% SSL cipher protocol %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -define(CHANGE_CIPHER_SPEC_PROTO, 1). % _PROTO to not clash with % SSL record protocol |