diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-09-10 09:52:45 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-09-10 09:52:45 +0200 |
| commit | 23de86802028de4e1dd2fe8169d4f448c0ac72bc (patch) | |
| tree | b2291b45246bdfdcea7e3c9872246ee5bb98e88c /lib/ssl/src/ssl.app.src | |
| parent | 04a107f23732fda1a95d6194fb6395e1c94fc534 (diff) | |
| parent | 754b87eb181552d67c61c9a80c31ce52e4b39f19 (diff) | |
| download | otp-23de86802028de4e1dd2fe8169d4f448c0ac72bc.tar.gz otp-23de86802028de4e1dd2fe8169d4f448c0ac72bc.tar.bz2 otp-23de86802028de4e1dd2fe8169d4f448c0ac72bc.zip | |
Merge branch 'ia/ssl/dtls-refactor/OTP-11292' into maint
* ia/ssl/dtls-refactor/OTP-11292:
ssl: Refactor TLS/DTLS record handling
ssl: Dialyzer fixes
ssl: Solve rebase issues
ssl: DTLS record handling
ssl: Add DTLS record primitives
ssl: Refactor to provide common handshake functions for TLS/DTLS
ssl: Add DTLS handshake primitivs.
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
| -rw-r--r-- | lib/ssl/src/ssl.app.src | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 582a60635f..44798f8c12 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -3,40 +3,44 @@ {vsn, "%VSN%"}, {modules, [ %% TLS/SSL - tls, tls_connection, tls_handshake, tls_record, + tls_v1, + ssl_v3, + ssl_v2, %% DTLS - dtls_record, - dtls_handshake, dtls_connection, - dtls, - %% Backwards compatibility + dtls_handshake, + dtls_record, + dtls_v1, + %% API + tls, %% Future API module + dtls, %% Future API module ssl, + ssl_session_cache_api, %% Both TLS/SSL and DTLS - ssl_app, - ssl_sup, + 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, ssl_dist_sup, - ssl_tls1, - ssl_ssl3, - ssl_ssl2, + %% SSL/TLS session handling ssl_session, - ssl_session_cache_api, ssl_session_cache, - ssl_socket, - %%ssl_record, ssl_manager, - %%ssl_handshake, - ssl_connection_sup, - %%ssl_connection, - ssl_cipher, - ssl_srp_primes, ssl_pkix_db, ssl_certificate, - ssl_alert + %% App structure + ssl_app, + ssl_sup, + ssl_connection_sup ]}, {registered, [ssl_sup, ssl_manager]}, {applications, [crypto, public_key, kernel, stdlib]}, |