diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-12-02 10:24:56 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-12-02 10:24:56 +0100 |
| commit | c3d9d667e028284d6f96f8e260d094f1775182ea (patch) | |
| tree | f88229efc098d69e798132acc540835e11e24571 /lib/ssl/src/ssl.app.src | |
| parent | f2fc6a63429f0c7945e7644e5fe3d8ee265bd28f (diff) | |
| parent | 239ce1c4781fe4fc25c55795573654453887f507 (diff) | |
| download | otp-c3d9d667e028284d6f96f8e260d094f1775182ea.tar.gz otp-c3d9d667e028284d6f96f8e260d094f1775182ea.tar.bz2 otp-c3d9d667e028284d6f96f8e260d094f1775182ea.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
| -rw-r--r-- | lib/ssl/src/ssl.app.src | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 44798f8c12..68ebc49e4a 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -15,18 +15,19 @@ dtls_record, dtls_v1, %% API - tls, %% Future API module - dtls, %% Future API module - ssl, + ssl, %% Main API + tls, %% TLS specific + dtls, %% DTLS specific ssl_session_cache_api, %% Both TLS/SSL and DTLS + ssl_config, + ssl_connection, ssl_handshake, ssl_record, ssl_cipher, ssl_srp_primes, ssl_alert, ssl_socket, - %%ssl_connection, %% Erlang Distribution over SSL/TLS inet_tls_dist, ssl_tls_dist_proxy, @@ -40,7 +41,8 @@ %% App structure ssl_app, ssl_sup, - ssl_connection_sup + tls_connection_sup, + dtls_connection_sup ]}, {registered, [ssl_sup, ssl_manager]}, {applications, [crypto, public_key, kernel, stdlib]}, |