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/service | |
| 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/service')
| -rw-r--r-- | src/net/java/sip/communicator/service/certificate/CertificateService.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/service/certificate/CertificateService.java b/src/net/java/sip/communicator/service/certificate/CertificateService.java index 8197932..8d40805 100644 --- a/src/net/java/sip/communicator/service/certificate/CertificateService.java +++ b/src/net/java/sip/communicator/service/certificate/CertificateService.java @@ -49,7 +49,14 @@ public interface CertificateService * Property that is being applied to the system property
* <tt>javax.net.ssl.trustStoreType</tt>
*/
- public static final String PNAME_TRUSTSTORE =
+ public static final String PNAME_TRUSTSTORE_TYPE =
+ "net.java.sip.communicator.service.cert.truststore.type";
+
+ /**
+ * Property that is being applied to the system property
+ * <tt>javax.net.ssl.trustStore</tt>
+ */
+ public static final String PNAME_TRUSTSTORE_FILE =
"net.java.sip.communicator.service.cert.truststore.file";
/**
@@ -57,7 +64,7 @@ public interface CertificateService * <tt>javax.net.ssl.trustStorePassword</tt>
*/
public static final String PNAME_TRUSTSTORE_PASSWORD =
- "net.java.sip.communicator.service.cert.truststore";
+ "net.java.sip.communicator.service.cert.truststore.password";
// ------------------------------------------------------------------------
// constants
|