aboutsummaryrefslogtreecommitdiffstats
path: root/src/ranch_ssl.erl
diff options
context:
space:
mode:
authorMaria Scott <[email protected]>2022-10-06 17:42:12 +0200
committerLoïc Hoguin <[email protected]>2022-10-10 11:59:53 +0200
commit61cff065a60f4d4d72edf129e5d07ac3ebcf5a86 (patch)
treec99ad9c5dab7f308597e620226b5298e2fd1bae8 /src/ranch_ssl.erl
parent6a26bb8d91d61ff9755a9844bd2a5f7ca8ada888 (diff)
downloadranch-61cff065a60f4d4d72edf129e5d07ac3ebcf5a86.tar.gz
ranch-61cff065a60f4d4d72edf129e5d07ac3ebcf5a86.tar.bz2
ranch-61cff065a60f4d4d72edf129e5d07ac3ebcf5a86.zip
Allow new ssl option certs_keys in ranch_ssl
Diffstat (limited to 'src/ranch_ssl.erl')
-rw-r--r--src/ranch_ssl.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl
index ff5831e..428f91c 100644
--- a/src/ranch_ssl.erl
+++ b/src/ranch_ssl.erl
@@ -53,6 +53,11 @@
| {cacertfile, file:filename()}
| {cacerts, [public_key:der_encoded()]}
| {cert, public_key:der_encoded()}
+ | {certs_keys, [#{cert => public_key:der_encoded(),
+ key => ssl:key(),
+ certfile => file:filename(),
+ keyfile => file:filename(),
+ key_pem_password => iodata() | fun(() -> iodata())}]}
| {certfile, file:filename()}
| {ciphers, ssl:ciphers()}
| {client_renegotiation, boolean()}
@@ -119,7 +124,8 @@ listen(TransOpts) ->
orelse lists:keymember(certfile, 1, SocketOpts)
orelse lists:keymember(sni_fun, 1, SocketOpts)
orelse lists:keymember(sni_hosts, 1, SocketOpts)
- orelse lists:keymember(user_lookup_fun, 1, SocketOpts) of
+ orelse lists:keymember(user_lookup_fun, 1, SocketOpts)
+ orelse lists:keymember(certs_keys, 1, SocketOpts) of
true ->
Logger = maps:get(logger, TransOpts, logger),
do_listen(SocketOpts, Logger);