diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2011-09-24 12:52:45 +0000 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2011-09-24 12:52:45 +0000 |
| commit | 230e8e5a258687779945c4c8d94411728a997483 (patch) | |
| tree | f255bd44e7deb6d0c5aad458827da1b04721f768 /src/net/java/sip/communicator/plugin/certconfig | |
| parent | 8cc88ffc07a2210b1d6deee29fdb23319c97defc (diff) | |
| download | jitsi-230e8e5a258687779945c4c8d94411728a997483.zip jitsi-230e8e5a258687779945c4c8d94411728a997483.tar.gz jitsi-230e8e5a258687779945c4c8d94411728a997483.tar.bz2 | |
Remove option for Windows as CA source on x64 for JRE != 1.7, allow setting of trustStore system properties, fail XMPP connections when our TrustManager cannot be set
Diffstat (limited to 'src/net/java/sip/communicator/plugin/certconfig')
| -rw-r--r-- | src/net/java/sip/communicator/plugin/certconfig/CertConfigPanel.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/plugin/certconfig/CertConfigPanel.java b/src/net/java/sip/communicator/plugin/certconfig/CertConfigPanel.java index 0c4dd41..f3a047a 100644 --- a/src/net/java/sip/communicator/plugin/certconfig/CertConfigPanel.java +++ b/src/net/java/sip/communicator/plugin/certconfig/CertConfigPanel.java @@ -64,7 +64,10 @@ public class CertConfigPanel {
this.setLayout(new BorderLayout());
- if (OSUtils.IS_WINDOWS)
+ //TODO change to OSUtils.IS_WINDOWS as soon as we ship with JRE 1.7
+ if (OSUtils.IS_WINDOWS32
+ || (OSUtils.IS_WINDOWS
+ && System.getProperty("java.version").startsWith("1.7")))
{
JPanel pnlCertConfig = new TransparentPanel(new GridLayout(2, 1));
pnlCertConfig.setBorder(BorderFactory.createTitledBorder(
@@ -88,7 +91,7 @@ public class CertConfigPanel pnlCertConfig.add(rdoUseWindows);
if ("Windows-ROOT".equals(CertConfigActivator.getConfigService()
- .getProperty(CertificateService.PNAME_TRUSTSTORE)))
+ .getProperty(CertificateService.PNAME_TRUSTSTORE_TYPE)))
{
rdoUseWindows.setSelected(true);
}
@@ -173,14 +176,20 @@ public class CertConfigPanel if (e.getSource() == rdoUseJava)
{
CertConfigActivator.getConfigService().removeProperty(
- CertificateService.PNAME_TRUSTSTORE);
+ CertificateService.PNAME_TRUSTSTORE_TYPE);
+ CertConfigActivator.getConfigService().removeProperty(
+ CertificateService.PNAME_TRUSTSTORE_FILE);
CertConfigActivator.getCredService().removePassword(
CertificateService.PNAME_TRUSTSTORE_PASSWORD);
}
if (e.getSource() == rdoUseWindows)
{
CertConfigActivator.getConfigService().setProperty(
- CertificateService.PNAME_TRUSTSTORE, "Windows-ROOT");
+ CertificateService.PNAME_TRUSTSTORE_TYPE, "Windows-ROOT");
+ CertConfigActivator.getConfigService().removeProperty(
+ CertificateService.PNAME_TRUSTSTORE_FILE);
+ CertConfigActivator.getCredService().removePassword(
+ CertificateService.PNAME_TRUSTSTORE_PASSWORD);
}
}
|