# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1385000063 0
# Node ID dd11480ecd473efe1c6ff15615182d003d57b1f0
# Parent  d1cc67ed076737382f95354ca4aee5168f496738# Parent  f7601ce30cfc73852b6070ec2d8c5992dbbbeb80
Merge 0.9->0.10

diff -r d1cc67ed0767 -r dd11480ecd47 core/certmanager.lua
--- a/core/certmanager.lua	Tue Nov 12 11:38:52 2013 +0100
+++ b/core/certmanager.lua	Thu Nov 21 02:14:23 2013 +0000
@@ -40,7 +40,7 @@
 	options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil };
 	verifyext = { "lsec_continue", "lsec_ignore_purpose" };
 	curve = "secp384r1";
-	ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL";
+	ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL";
 }
 local path_options = { -- These we pass through resolve_path()
 	key = true, certificate = true, cafile = true, capath = true, dhparam = true