aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_cipher.hrl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-06-29 11:21:41 +0200
committerIngela Anderton Andin <[email protected]>2010-06-29 11:21:41 +0200
commit5ef0b06ddbaa48499394c30d56fc81e7162abf50 (patch)
tree09960a4dd828d06b05a48e656657cf7949bda4b0 /lib/ssl/src/ssl_cipher.hrl
parent249613f10368dc694edb0a962d6025e19940b5af (diff)
parent80e96ac836975c537ebbb7588cce9390775e20db (diff)
downloadotp-5ef0b06ddbaa48499394c30d56fc81e7162abf50.tar.gz
otp-5ef0b06ddbaa48499394c30d56fc81e7162abf50.tar.bz2
otp-5ef0b06ddbaa48499394c30d56fc81e7162abf50.zip
Merge branch 'ia/ssl/new-doc' into dev
Diffstat (limited to 'lib/ssl/src/ssl_cipher.hrl')
-rw-r--r--lib/ssl/src/ssl_cipher.hrl8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl
index 80fe527f45..19de709d9c 100644
--- a/lib/ssl/src/ssl_cipher.hrl
+++ b/lib/ssl/src/ssl_cipher.hrl
@@ -26,6 +26,14 @@
-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() :: sha | md5.
+-type erl_cipher_suite() :: {key_algo(), cipher(), hash()}.
+-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