Software / code / prosody
Comparison
core/certmanager.lua @ 5922:dd11480ecd47
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 21 Nov 2013 02:14:23 +0000 |
| parent | 5916:1c4405f33561 |
| parent | 5921:f7601ce30cfc |
| child | 6073:4a1fdd72e98a |
comparison
equal
deleted
inserted
replaced
| 5919:d1cc67ed0767 | 5922:dd11480ecd47 |
|---|---|
| 38 protocol = "sslv23"; | 38 protocol = "sslv23"; |
| 39 verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none"; | 39 verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none"; |
| 40 options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil }; | 40 options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil }; |
| 41 verifyext = { "lsec_continue", "lsec_ignore_purpose" }; | 41 verifyext = { "lsec_continue", "lsec_ignore_purpose" }; |
| 42 curve = "secp384r1"; | 42 curve = "secp384r1"; |
| 43 ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL"; | 43 ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH:!PSK:!SRP:!3DES:!aNULL"; |
| 44 } | 44 } |
| 45 local path_options = { -- These we pass through resolve_path() | 45 local path_options = { -- These we pass through resolve_path() |
| 46 key = true, certificate = true, cafile = true, capath = true, dhparam = true | 46 key = true, certificate = true, cafile = true, capath = true, dhparam = true |
| 47 } | 47 } |
| 48 | 48 |