Diff

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
line wrap: on
line diff
--- a/core/certmanager.lua	Fri Sep 29 10:50:27 2017 +0200
+++ b/core/certmanager.lua	Fri Sep 29 13:45:03 2017 +0200
@@ -107,6 +107,12 @@
 	};
 	verifyext = { "lsec_continue", "lsec_ignore_purpose" };
 	curve = "secp384r1";
+	curveslist = {
+		"X25519",
+		"P-384",
+		"P-256",
+		"P-521",
+	};
 	ciphers = {      -- Enabled ciphers in order of preference:
 		"HIGH+kEDH",   -- Ephemeral Diffie-Hellman key exchange, if a 'dhparam' file is set
 		"HIGH+kEECDH", -- Ephemeral Elliptic curve Diffie-Hellman key exchange
@@ -231,4 +237,5 @@
 return {
 	create_context = create_context;
 	reload_ssl_config = reload_ssl_config;
+	find_cert = find_cert;
 };