Comparison

core/certmanager.lua @ 5679:51f7de1b6bb5

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 13 Jun 2013 00:46:29 +0100
parent 5677:9afc94c4346e
parent 5678:b7ebeae14053
child 5684:5554029d759b
comparison
equal deleted inserted replaced
5677:9afc94c4346e 5679:51f7de1b6bb5
40 default_verify[#default_verify+1] = default_verifyext[i]:sub(6); 40 default_verify[#default_verify+1] = default_verifyext[i]:sub(6);
41 end 41 end
42 end 42 end
43 if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true then 43 if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true then
44 default_options[#default_options+1] = "no_compression"; 44 default_options[#default_options+1] = "no_compression";
45 end
46
47 if luasec_has_no_compression then -- Has no_compression? Then it has these too...
48 default_options[#default_options+1] = "single_dh_use";
49 default_options[#default_options+1] = "single_ecdh_use";
45 end 50 end
46 51
47 function create_context(host, mode, user_ssl_config) 52 function create_context(host, mode, user_ssl_config)
48 user_ssl_config = user_ssl_config or default_ssl_config; 53 user_ssl_config = user_ssl_config or default_ssl_config;
49 54