diff options
author | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:01:39 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:01:39 +0100 |
commit | b91e7498e625b4e6419238f753c30b509fb958d2 (patch) | |
tree | 13242c026475c2942ee3c998c8b12816f8b65646 /lib/ssl/src/ssl.app.src | |
parent | f015c1ae35a94ca52e80ceae7a76806fe848a553 (diff) | |
parent | 1e6942e97339ff39a0436834c260bf50c3d3a481 (diff) | |
download | otp-b91e7498e625b4e6419238f753c30b509fb958d2.tar.gz otp-b91e7498e625b4e6419238f753c30b509fb958d2.tar.bz2 otp-b91e7498e625b4e6419238f753c30b509fb958d2.zip |
Merge branch 'ingela/dtls/statem/OTP-12982' into maint
* ingela/dtls/statem/OTP-12982:
ssl: Implement DTLS state machine
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
-rw-r--r-- | lib/ssl/src/ssl.app.src | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 00b0513891..9c5d795848 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -6,6 +6,7 @@ tls_connection, tls_handshake, tls_record, + tls_socket, tls_v1, ssl_v3, ssl_v2, @@ -13,7 +14,10 @@ dtls_connection, dtls_handshake, dtls_record, + dtls_socket, dtls_v1, + dtls_udp_listener, + dtls_udp_sup, %% API ssl, %% Main API tls, %% TLS specific @@ -27,7 +31,6 @@ ssl_cipher, ssl_srp_primes, ssl_alert, - ssl_socket, ssl_listen_tracker_sup, %% Erlang Distribution over SSL/TLS inet_tls_dist, |