diff options
author | wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2008-12-05 11:41:29 +0000 |
---|---|---|
committer | wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2008-12-05 11:41:29 +0000 |
commit | 3e101b29f0ac1efa5088ba953bea0acbba932339 (patch) | |
tree | b64e4141b06fb6d95b1e32296c2682dd6766f253 /bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java | |
parent | e51d51cf7f51a54b5e4e3414ac428fc6eecf5d8d (diff) | |
download | mocca-3e101b29f0ac1efa5088ba953bea0acbba932339.tar.gz mocca-3e101b29f0ac1efa5088ba953bea0acbba932339.tar.bz2 mocca-3e101b29f0ac1efa5088ba953bea0acbba932339.zip |
Feature Request #362
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@234 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java')
-rw-r--r-- | bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java index 6078de36..e37d107f 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java @@ -80,7 +80,7 @@ public abstract class Configurator { log.error("Cannot add trusted ca", e);
}
}
- return caCerts.toArray(new X509Certificate[caCerts.size()]);
+ return caCerts.toArray(new X509Certificate[caCerts.size()]);
} else {
log.warn("No CA certificates configured");
}
@@ -196,10 +196,9 @@ public abstract class Configurator { String version = p.getProperty("Implementation-Build");
properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
"citizen-card-environment/1.2 MOCCA " + version);
- log
- .debug("Setting user agent to: "
- + properties
- .getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY));
+ log.debug("Setting user agent to: "
+ + properties
+ .getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY));
} else {
log.warn("Cannot read manifest");
properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
@@ -256,7 +255,7 @@ public abstract class Configurator { getCertDir(), getCADir(), caCerts);
sslCtx.init(km, new TrustManager[] { pkixTM }, null);
}
- HttpsURLConnection.setDefaultSSLSocketFactory(sslCtx.getSocketFactory());
+ DataUrl.setSSLSocketFactory(sslCtx.getSocketFactory());
} catch (Exception e) {
log.error("Cannot configure SSL", e);
}
@@ -264,7 +263,7 @@ public abstract class Configurator { log.warn("---------------------------------");
log.warn(" Disabling Hostname Verification ");
log.warn("---------------------------------");
- HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
+ DataUrl.setHostNameVerifier(new HostnameVerifier() {
@Override
public boolean verify(String hostname, SSLSession session) {
return true;
@@ -273,8 +272,6 @@ public abstract class Configurator { }
}
-
-
public void setCertValidator(CertValidator certValidator) {
this.certValidator = certValidator;
}
|