aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-03-06 20:03:21 +0100
committerLoïc Hoguin <[email protected]>2013-03-06 20:03:21 +0100
commit65c8766ae7a863d015e725833d06d27a81c29274 (patch)
tree39114a1c1361d6dd58759e9f5b980361d73967d2 /src
parent5c5a87fe1ed4740bf9b81399d00cceb0213c7a2c (diff)
downloadranch-65c8766ae7a863d015e725833d06d27a81c29274.tar.gz
ranch-65c8766ae7a863d015e725833d06d27a81c29274.tar.bz2
ranch-65c8766ae7a863d015e725833d06d27a81c29274.zip
Add next_protocols_advertised option to ranch_ssl
For TLS Next Protocol Negotiation support.
Diffstat (limited to 'src')
-rw-r--r--src/ranch_ssl.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl
index a5de96e..3155f25 100644
--- a/src/ranch_ssl.erl
+++ b/src/ranch_ssl.erl
@@ -70,6 +70,9 @@ messages() -> {ssl, ssl_closed, ssl_error}.
%% by default.</dd>
%% <dt>keyfile</dt><dd>Optional. Path to the file containing the user's
%% private PEM encoded key.</dd>
+%% <dt>next_protocols_advertised</dt><dd>Optional. Erlang R16B+ required.
+%% List of protocols advertised by TLS Next Protocol Negotiation
+%% extension.</dd>
%% <dt>nodelay</dt><dd>Optional. Enable TCP_NODELAY. Enabled by default.</dd>
%% <dt>password</dt><dd>Optional. String containing the user's password.
%% All private keyfiles must be password protected currently.</dd>
@@ -88,7 +91,8 @@ messages() -> {ssl, ssl_closed, ssl_error}.
-spec listen([{backlog, non_neg_integer()} | {cacertfile, string()}
| {certfile, string()} | {ciphers, [ssl:erl_cipher_suite()] | string()}
| {fail_if_no_peer_cert, boolean()}
- | {ip, inet:ip_address()} | {keyfile, string()} | {nodelay, boolean()}
+ | {ip, inet:ip_address()} | {keyfile, string()}
+ | {next_protocols_advertised, [binary()]} | {nodelay, boolean()}
| {password, string()} | {port, inet:port_number()}
| {verify, ssl:verify_type()}])
-> {ok, ssl:sslsocket()} | {error, atom()}.
@@ -101,7 +105,8 @@ listen(Opts) ->
%% first argument.
ssl:listen(0, ranch:filter_options(Opts2,
[backlog, cacertfile, certfile, ciphers, fail_if_no_peer_cert, ip,
- keyfile, nodelay, password, port, raw, verify],
+ keyfile, next_protocols_advertised, nodelay, password, port,
+ raw, verify],
[binary, {active, false}, {packet, raw},
{reuseaddr, true}, {nodelay, true}])).