From fc0a20c2da0a45bf98c718df2c68a85369543890 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 7 May 2017 11:33:34 +0100 Subject: [PATCH] Revert "Protocol specification for prosody 0.10+" This reverts commit 29cac8fc6a1c255e8a0dfa14cd0fa8ede796c9c6. --- src/freedombone-app-xmpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp index 5fc6ed72..e690d048 100755 --- a/src/freedombone-app-xmpp +++ b/src/freedombone-app-xmpp @@ -675,7 +675,7 @@ function xmpp_create_config { echo " key = \"/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua echo " curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua echo " ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua - echo ' options = { "tlsv1+" };' >> /etc/prosody/prosody.cfg.lua + echo ' options = {"no_sslv2", "no_sslv3" };' >> /etc/prosody/prosody.cfg.lua echo " dhparam = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua echo "}" >> /etc/prosody/prosody.cfg.lua echo '' >> /etc/prosody/prosody.cfg.lua @@ -689,7 +689,7 @@ function xmpp_create_config { echo " curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua echo ' depth = "2";' >> /etc/prosody/prosody.cfg.lua echo " ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua - echo ' options = { "tlsv1+" };' >> /etc/prosody/prosody.cfg.lua + echo ' options = {"no_sslv2", "no_sslv3" };' >> /etc/prosody/prosody.cfg.lua echo " dhparam = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua echo '}' >> /etc/prosody/prosody.cfg.lua echo '' >> /etc/prosody/prosody.cfg.lua @@ -724,7 +724,7 @@ function xmpp_create_config { echo " curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua echo ' depth = "2";' >> /etc/prosody/prosody.cfg.lua echo " ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua - echo ' options = { "tlsv1+" };' >> /etc/prosody/prosody.cfg.lua + echo ' options = {"no_sslv2", "no_sslv3" };' >> /etc/prosody/prosody.cfg.lua echo " dhparam = \"/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua echo ' }' >> /etc/prosody/prosody.cfg.lua echo '' >> /etc/prosody/prosody.cfg.lua @@ -890,8 +890,8 @@ function install_xmpp_main { sed -i '/certificate =/a\ dhparam = "/etc/prosody/certs/xmpp.dhparam";' /etc/prosody/conf.avail/xmpp.cfg.lua fi fi - if ! grep -q 'options = { "tlsv1+" }' /etc/prosody/conf.avail/xmpp.cfg.lua; then - sed -i '/certificate =/a\ options = { "tlsv1+" };' /etc/prosody/conf.avail/xmpp.cfg.lua + if ! grep -q 'options = {"no_sslv2", "no_sslv3" }' /etc/prosody/conf.avail/xmpp.cfg.lua; then + sed -i '/certificate =/a\ options = {"no_sslv2", "no_sslv3" };' /etc/prosody/conf.avail/xmpp.cfg.lua fi if ! grep -q 'ciphers =' /etc/prosody/conf.avail/xmpp.cfg.lua; then sed -i "/certificate =/a\ ciphers = $XMPP_CIPHERS;" /etc/prosody/conf.avail/xmpp.cfg.lua