diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-12-06 15:42:18 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-12-06 15:42:18 +0100 |
| commit | 6bc9c65ae207ebc2fba03521c2ca3b84264a1dcf (patch) | |
| tree | 7017f536fe5557b1494d1b3844ff776b5bfcae40 /lib/ssl/src/ssl.erl | |
| parent | 51f1f06bafa99291daaafe22a24a1dc4ff45d067 (diff) | |
| parent | 1cbd897c43f0dab1275392a3736e4629c1f80243 (diff) | |
| download | otp-6bc9c65ae207ebc2fba03521c2ca3b84264a1dcf.tar.gz otp-6bc9c65ae207ebc2fba03521c2ca3b84264a1dcf.tar.bz2 otp-6bc9c65ae207ebc2fba03521c2ca3b84264a1dcf.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/sys/vxworks/sys.c
erts/vsn.mk
lib/ssl/src/ssl_connection.erl
lib/ssl/test/ssl_basic_SUITE.erl
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 771bfa5739..6224334a6e 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -47,7 +47,7 @@ -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]). + prf_random/0, sslsocket/0]). -record(config, {ssl, %% SSL parameters inet_user, %% User set inet options @@ -55,6 +55,8 @@ inet_ssl, %% inet options for internal ssl socket cb %% Callback info }). + +-type sslsocket() :: #sslsocket{}. -type connect_option() :: socket_connect_option() | ssl_option() | transport_option(). -type socket_connect_option() :: gen_tcp:connect_option(). -type listen_option() :: socket_listen_option() | ssl_option() | transport_option(). |