aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2015-10-04 18:33:58 +0200
committerIngo Bauersachs <ingo@jitsi.org>2015-10-04 18:40:58 +0200
commit7741cbabaced38700ada035e304a36e9551e8c29 (patch)
tree1d5247120682f9e69ba8d64f4a16c20570e1f4da /lib
parent8f98a17d91c4fed3a3e3984c8e8955ccfada6e85 (diff)
downloadjitsi-7741cbabaced38700ada035e304a36e9551e8c29.zip
jitsi-7741cbabaced38700ada035e304a36e9551e8c29.tar.gz
jitsi-7741cbabaced38700ada035e304a36e9551e8c29.tar.bz2
Move SDES default ciphers from settings to default config
Diffstat (limited to 'lib')
-rw-r--r--lib/jitsi-defaults.properties2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/jitsi-defaults.properties b/lib/jitsi-defaults.properties
index b5d6016..417bd00 100644
--- a/lib/jitsi-defaults.properties
+++ b/lib/jitsi-defaults.properties
@@ -42,6 +42,8 @@ plugin.simpleaccreg.PROTOCOL_ORDER=SIP|Jabber|Facebook|Google Talk
#provisioning defaults
net.java.sip.communicator.plugin.provisioning.MANDATORY=false
+net.java.sip.communicator.service.neomedia.SDES_CIPHER_SUITES=AES_CM_128_HMAC_SHA1_80,AES_CM_128_HMAC_SHA1_32
+
# Bundles marked as "system" in the plugin editor
net.java.sip.communicator.plugin.pluginmanager.SYSTEM_BUNDLES=\
net.java.sip.communicator.impl.splashscreen, \