From 61cff065a60f4d4d72edf129e5d07ac3ebcf5a86 Mon Sep 17 00:00:00 2001 From: Maria Scott Date: Thu, 6 Oct 2022 17:42:12 +0200 Subject: Allow new ssl option certs_keys in ranch_ssl --- src/ranch_ssl.erl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') 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); -- cgit v1.2.3