aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2017-07-25 16:11:25 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2017-07-25 16:11:25 +0200
commit040e51d335d3af127c3894bd5558a484ddd9b9ea (patch)
tree6a7f0935a36318a38b87e4acd725b0776924c75a /id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
parentc4fe089610dba3d6e8929f6e163538dfae0d18da (diff)
downloadmoa-id-spss-040e51d335d3af127c3894bd5558a484ddd9b9ea.tar.gz
moa-id-spss-040e51d335d3af127c3894bd5558a484ddd9b9ea.tar.bz2
moa-id-spss-040e51d335d3af127c3894bd5558a484ddd9b9ea.zip
Revert "betaversion for a workaround to solve problem with Java8 >= 141 and SHA1 certificates in certificate chain"
This reverts commit c4fe089610dba3d6e8929f6e163538dfae0d18da.
Diffstat (limited to 'id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java')
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
index 3e793e4d1..109390132 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/SSLUtils.java
@@ -147,7 +147,6 @@ public class SSLUtils {
SSLContext ctx = SSLContext.getInstance("TLS");
ctx.init(kms, tms, null);
ssf = ctx.getSocketFactory();
-
// store SSLSocketFactory
sslSocketFactories.put(url, ssf);
@@ -260,8 +259,7 @@ public class SSLUtils {
MOAIDTrustManager.initializeLoggingContext();
MOAIDTrustManager tm = new MOAIDTrustManager(acceptedServerCertURL);
tm.init(cfg, profile);
- return new TrustManager[] {new MOATrustManagerWrapper(tm)};
-
+ return new TrustManager[] {tm};
}
}