diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-01-25 11:05:27 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-01-25 11:05:27 +0100 |
| commit | aff5d7501af8081faeb2b6ead963c680765852f3 (patch) | |
| tree | 23f18d2f2d2e03527a1c3b347518b8fbe2914169 /lib/ssl/src/ssl.app.src | |
| parent | 8e16234a480d5b5e24a9724c9c8871604fd80627 (diff) | |
| parent | c2a833811c768fc38b51a5241f55eb25786ac13e (diff) | |
| download | otp-aff5d7501af8081faeb2b6ead963c680765852f3.tar.gz otp-aff5d7501af8081faeb2b6ead963c680765852f3.tar.bz2 otp-aff5d7501af8081faeb2b6ead963c680765852f3.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
| -rw-r--r-- | lib/ssl/src/ssl.app.src | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 9c5d795848..148989174d 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -10,12 +10,14 @@ tls_v1, ssl_v3, ssl_v2, + tls_connection_sup, %% DTLS dtls_connection, dtls_handshake, dtls_record, dtls_socket, dtls_v1, + dtls_connection_sup, dtls_udp_listener, dtls_udp_sup, %% API @@ -31,16 +33,19 @@ ssl_cipher, ssl_srp_primes, ssl_alert, - ssl_listen_tracker_sup, + ssl_listen_tracker_sup, %% may be used by DTLS over SCTP %% Erlang Distribution over SSL/TLS inet_tls_dist, inet6_tls_dist, ssl_tls_dist_proxy, ssl_dist_sup, - %% SSL/TLS session handling + ssl_dist_connection_sup, + ssl_dist_admin_sup, + %% SSL/TLS session and cert handling ssl_session, ssl_session_cache, ssl_manager, + ssl_pem_cache, ssl_pkix_db, ssl_certificate, %% CRL handling @@ -51,8 +56,8 @@ %% App structure ssl_app, ssl_sup, - tls_connection_sup, - dtls_connection_sup + ssl_admin_sup, + ssl_connection_sup ]}, {registered, [ssl_sup, ssl_manager]}, {applications, [crypto, public_key, kernel, stdlib]}, |