diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2015-10-04 18:33:58 +0200 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2015-10-04 18:40:58 +0200 |
| commit | 7741cbabaced38700ada035e304a36e9551e8c29 (patch) | |
| tree | 1d5247120682f9e69ba8d64f4a16c20570e1f4da | |
| parent | 8f98a17d91c4fed3a3e3984c8e8955ccfada6e85 (diff) | |
| download | jitsi-7741cbabaced38700ada035e304a36e9551e8c29.zip jitsi-7741cbabaced38700ada035e304a36e9551e8c29.tar.gz jitsi-7741cbabaced38700ada035e304a36e9551e8c29.tar.bz2 | |
Move SDES default ciphers from settings to default config
| -rw-r--r-- | lib/jitsi-defaults.properties | 2 | ||||
| -rw-r--r-- | resources/config/defaults.properties | 2 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java | 6 |
3 files changed, 6 insertions, 4 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, \ diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties index b8df03d..f126476 100644 --- a/resources/config/defaults.properties +++ b/resources/config/defaults.properties @@ -89,8 +89,6 @@ net.java.sip.communicator.util.dns.DS_ROOT.1=. IN DS 19036 8 2 49AAC11D7B6F64467 plugin.jabberaccregwizz.NEW_ACCOUNT_DEFAULT_SERVER=jit.si -net.java.sip.communicator.service.neomedia.SDES_CIPHER_SUITES=AES_CM_128_HMAC_SHA1_80,AES_CM_128_HMAC_SHA1_32 - impl.gui.PARANOIA_UI=false impl.gui.I_DONT_CARE_THAT_MUCH_ABOUT_SECURITY=false diff --git a/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java b/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java index 483f220..e81f4da 100644 --- a/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java +++ b/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java @@ -113,8 +113,10 @@ public class SecurityPanel private static final long serialVersionUID = 0L; private List<Entry> data = new ArrayList<Entry>(); - private final String defaultCiphers = UtilActivator.getResources() - .getSettingsString(SDesControl.SDES_CIPHER_SUITES); + + private final String defaultCiphers = + UtilActivator.getConfigurationService() + .getString(SDesControl.SDES_CIPHER_SUITES); CipherTableModel(String ciphers) { |