Comparison

core/certmanager.lua @ 8285:433b2a41351f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 29 Sep 2017 13:45:03 +0200
parent 8279:92cddfe65003
child 8403:ba39d3a1d42e
comparison
equal deleted inserted replaced
8271:c09deab9989e 8285:433b2a41351f
105 single_dh_use = luasec_has.single_dh_use; 105 single_dh_use = luasec_has.single_dh_use;
106 single_ecdh_use = luasec_has.single_ecdh_use; 106 single_ecdh_use = luasec_has.single_ecdh_use;
107 }; 107 };
108 verifyext = { "lsec_continue", "lsec_ignore_purpose" }; 108 verifyext = { "lsec_continue", "lsec_ignore_purpose" };
109 curve = "secp384r1"; 109 curve = "secp384r1";
110 curveslist = {
111 "X25519",
112 "P-384",
113 "P-256",
114 "P-521",
115 };
110 ciphers = { -- Enabled ciphers in order of preference: 116 ciphers = { -- Enabled ciphers in order of preference:
111 "HIGH+kEDH", -- Ephemeral Diffie-Hellman key exchange, if a 'dhparam' file is set 117 "HIGH+kEDH", -- Ephemeral Diffie-Hellman key exchange, if a 'dhparam' file is set
112 "HIGH+kEECDH", -- Ephemeral Elliptic curve Diffie-Hellman key exchange 118 "HIGH+kEECDH", -- Ephemeral Elliptic curve Diffie-Hellman key exchange
113 "HIGH", -- Other "High strength" ciphers 119 "HIGH", -- Other "High strength" ciphers
114 -- Disabled cipher suites: 120 -- Disabled cipher suites:
229 prosody.events.add_handler("config-reloaded", reload_ssl_config); 235 prosody.events.add_handler("config-reloaded", reload_ssl_config);
230 236
231 return { 237 return {
232 create_context = create_context; 238 create_context = create_context;
233 reload_ssl_config = reload_ssl_config; 239 reload_ssl_config = reload_ssl_config;
240 find_cert = find_cert;
234 }; 241 };