aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-03-28 12:01:31 +0200
committerIngela Anderton Andin <[email protected]>2012-03-28 12:01:31 +0200
commite93c9db144d3c9ffe032d0d316c31f9750b21739 (patch)
treeb42106c23a8fa10b911eeb701320e774a500f3b0 /lib/ssl/src/ssl.erl
parent40db677901d8b229773e45175bf55ebde66a7734 (diff)
parent49acec1bbc272556f87d47faf5dbc5b8f260598e (diff)
downloadotp-e93c9db144d3c9ffe032d0d316c31f9750b21739.tar.gz
otp-e93c9db144d3c9ffe032d0d316c31f9750b21739.tar.bz2
otp-e93c9db144d3c9ffe032d0d316c31f9750b21739.zip
Merge branch 'ia/ssl/dialyzer-specs' into maint
* ia/ssl/dialyzer-specs: Corrected dialyzer specs and exported some dialyzer specs
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r--lib/ssl/src/ssl.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 1048583eca..0bcdffbeff 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. 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
@@ -40,6 +40,12 @@
-include_lib("public_key/include/public_key.hrl").
+%% Visible in API
+-export_type([connect_option/0, listen_option/0, ssl_option/0, transport_option/0,
+ erl_cipher_suite/0, %% From ssl_cipher.hrl
+ tls_atom_version/0, %% From ssl_internal.hrl
+ prf_random/0]).
+
-record(config, {ssl, %% SSL parameters
inet_user, %% User set inet options
emulated, %% #socket_option{} emulated