# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1385000136 0
# Node ID 002db30661daa9e63488ee456d73445d04d1e6d9
# Parent  0e5a38ba4c15b63256ca9cd479e615dc36b61380# Parent  dd11480ecd473efe1c6ff15615182d003d57b1f0
Merge 0.10->trunk

diff -r 0e5a38ba4c15 -r 002db30661da core/certmanager.lua
--- a/core/certmanager.lua	Wed Nov 13 11:59:43 2013 +0100
+++ b/core/certmanager.lua	Thu Nov 21 02:15:36 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