aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java
diff options
context:
space:
mode:
authorWerner Dittmann <wernerd@java.net>2011-07-20 14:49:22 +0000
committerWerner Dittmann <wernerd@java.net>2011-07-20 14:49:22 +0000
commit785eec24c4be7ffc7fd6bada7797db8af71865bb (patch)
treee353f766e85fcfdbf1540abce229f12d055699df /src/net/java
parent6b00bd0f6208f8ff867c3dc153fd58ffe14c667f (diff)
downloadjitsi-785eec24c4be7ffc7fd6bada7797db8af71865bb.zip
jitsi-785eec24c4be7ffc7fd6bada7797db8af71865bb.tar.gz
jitsi-785eec24c4be7ffc7fd6bada7797db8af71865bb.tar.bz2
Display the ZRTP mandatory algorithms in case no specific ZRTP configuration was saved
Diffstat (limited to 'src/net/java')
-rw-r--r--src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java
index ecfef85..c991f1d 100644
--- a/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java
@@ -212,7 +212,7 @@ public class ZrtpConfigurePanel
String savedConf
= NeomediaActivator.getConfigurationService().getString(id);
if (savedConf == null)
- savedConf = "";
+ savedConf = "DH3K;MULT;";
dataModel
= new ZrtpConfigureTableModel<ZrtpConstants.SupportedPubKeys>(
@@ -252,7 +252,7 @@ public class ZrtpConfigurePanel
= NeomediaActivator.getConfigurationService()
.getString(id);
if (savedConf == null)
- savedConf = "";
+ savedConf = "S256";
dataModel
= new ZrtpConfigureTableModel<ZrtpConstants.SupportedHashes>(
@@ -289,7 +289,7 @@ public class ZrtpConfigurePanel
String savedConf
= NeomediaActivator.getConfigurationService().getString(id);
if (savedConf == null)
- savedConf = "";
+ savedConf = "AES1";
dataModel
= new ZrtpConfigureTableModel<ZrtpConstants.SupportedSymCiphers>(
@@ -327,7 +327,7 @@ public class ZrtpConfigurePanel
= NeomediaActivator.getConfigurationService()
.getString(id);
if (savedConf == null)
- savedConf = "";
+ savedConf = "B32";
dataModel
= new ZrtpConfigureTableModel<ZrtpConstants.SupportedSASTypes>(
@@ -364,7 +364,7 @@ public class ZrtpConfigurePanel
String savedConf
= NeomediaActivator.getConfigurationService().getString(id);
if (savedConf == null)
- savedConf = "";
+ savedConf = "HS32;HS80;";
dataModel
= new ZrtpConfigureTableModel<ZrtpConstants.SupportedAuthLengths>(