diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-05 09:39:34 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-05 09:39:34 +0200 |
| commit | 854a124e4cf4067b22032c53e1d26125bdc4208f (patch) | |
| tree | 5309b00ab02478f962ef2cadc3a9274e8156ad91 /lib/ssl/src/ssl.app.src | |
| parent | bef52cfebbbdc1f11f23387883a1e64a5d98fccc (diff) | |
| parent | f509fb7cef82413b19db0734a314c216b30a415c (diff) | |
| download | otp-854a124e4cf4067b22032c53e1d26125bdc4208f.tar.gz otp-854a124e4cf4067b22032c53e1d26125bdc4208f.tar.bz2 otp-854a124e4cf4067b22032c53e1d26125bdc4208f.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
| -rw-r--r-- | lib/ssl/src/ssl.app.src | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 5c34de905e..582a60635f 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -1,7 +1,20 @@ {application, ssl, [{description, "Erlang/OTP SSL application"}, {vsn, "%VSN%"}, - {modules, [ssl, + {modules, [ + %% TLS/SSL + tls, + tls_connection, + tls_handshake, + tls_record, + %% DTLS + dtls_record, + dtls_handshake, + dtls_connection, + dtls, + %% Backwards compatibility + ssl, + %% Both TLS/SSL and DTLS ssl_app, ssl_sup, inet_tls_dist, @@ -14,14 +27,14 @@ ssl_session_cache_api, ssl_session_cache, ssl_socket, - ssl_record, + %%ssl_record, ssl_manager, - ssl_handshake, + %%ssl_handshake, ssl_connection_sup, - ssl_connection, + %%ssl_connection, ssl_cipher, ssl_srp_primes, - ssl_certificate_db, + ssl_pkix_db, ssl_certificate, ssl_alert ]}, @@ -31,5 +44,3 @@ {mod, {ssl_app, []}}]}. - - |