# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1371080789 -3600
# Node ID 51f7de1b6bb5698d91c7b8fa3f2faeb8c3b115f6
# Parent  9afc94c4346eb5fc0b32fe8d3949eb38ce079181# Parent  b7ebeae14053d3f627f85406710607b6ff6be904
Merge 0.9->trunk

diff -r 9afc94c4346e -r 51f7de1b6bb5 core/certmanager.lua
--- a/core/certmanager.lua	Thu Jun 13 00:09:56 2013 +0100
+++ b/core/certmanager.lua	Thu Jun 13 00:46:29 2013 +0100
@@ -44,6 +44,11 @@
 	default_options[#default_options+1] = "no_compression";
 end
 
+if luasec_has_no_compression then -- Has no_compression? Then it has these too...
+	default_options[#default_options+1] = "single_dh_use";
+	default_options[#default_options+1] = "single_ecdh_use";
+end
+
 function create_context(host, mode, user_ssl_config)
 	user_ssl_config = user_ssl_config or default_ssl_config;