diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-03-28 12:03:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-03-28 12:03:02 +0200 |
| commit | f78bcd34cb6263ebcb36cb739f3714d7bc6fdf89 (patch) | |
| tree | 83f0c1f45997a227cfa1566b1a485143e46f8890 /lib/ssl/src/ssl.erl | |
| parent | b2ec189f6dd4b32fda23a8e41f209f03f0b8e297 (diff) | |
| parent | e93c9db144d3c9ffe032d0d316c31f9750b21739 (diff) | |
| download | otp-f78bcd34cb6263ebcb36cb739f3714d7bc6fdf89.tar.gz otp-f78bcd34cb6263ebcb36cb739f3714d7bc6fdf89.tar.bz2 otp-f78bcd34cb6263ebcb36cb739f3714d7bc6fdf89.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
[xmerl] Fix bug for comments in XSD files
[xmerl] Fix error message and documentation bug
Corrected dialyzer specs and exported some dialyzer specs
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 8 |
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 |