summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgeoffwhittington <geoff@sdelements.com>2015-03-14 20:34:15 -0400
committergeoffwhittington <geoff@sdelements.com>2015-03-14 20:34:15 -0400
commitf0db675e920a3047bb3911045363aef2442eb602 (patch)
treea6c2613fd2b6587c0fe169683d4f0b60c1229e57
parentc461b4167c8b2a92a9808cf87faab8f9c94586d1 (diff)
downloadlets-chat-origin/fix/158_tls_ciphers.zip
lets-chat-origin/fix/158_tls_ciphers.tar.gz
lets-chat-origin/fix/158_tls_ciphers.tar.bz2
Use server preferences, not clientorigin/fix/158_tls_ciphers
-rw-r--r--app.js2
-rw-r--r--app/xmpp/index.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app.js b/app.js
index cb002e9..84a4900 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ if (httpsEnabled) {
app = express().https({
key: fs.readFileSync(settings.https.key),
cert: fs.readFileSync(settings.https.cert),
- honorCipherOrder: settings.https.honorCipherOrder || true,
+ honorCipherOrder: true,
ciphers: settings.https.ciphers || 'AES128-GCM-SHA256',
handshakeTimeout: settings.https.handshakeTimeout || 5000,
secureOptions: settings.https.options || 'SSL_OP_NO_SSLv2:SSL_OP_NO_SSLv3:SSL_OP_NO_TLSv1'
diff --git a/app/xmpp/index.js b/app/xmpp/index.js
index 63e0bc0..b0ee1bb 100644
--- a/app/xmpp/index.js
+++ b/app/xmpp/index.js
@@ -28,7 +28,7 @@ function xmppStart(core) {
options.tls = {
keyPath: settings.xmpp.tls.key,
certPath: settings.xmpp.tls.cert,
- honorCipherOrder: settings.xmpp.tls.honorCipherOrder || true,
+ honorCipherOrder: true,
ciphers: settings.xmpp.tls.ciphers || 'AES128-GCM-SHA256',
handshakeTimeout: settings.xmpp.tls.handshakeTimeout || 5000,
secureOptions: settings.xmpp.tls.options || 'SSL_OP_NO_SSLv2:SSL_OP_NO_SSLv3:SSL_OP_NO_TLSv1'