diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-10-24 12:45:47 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-10-24 12:45:47 +0200 |
commit | d1a5528b2f542c1f7004f6f47fba0b083ff03277 (patch) | |
tree | 8e64bf5e8d51a81c449f79671f799fc6df43eb97 /id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java | |
parent | 479fb49056c4603069c50c43d38e7988efd733ee (diff) | |
download | moa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.tar.gz moa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.tar.bz2 moa-id-spss-d1a5528b2f542c1f7004f6f47fba0b083ff03277.zip |
remove MOA-ID specific certStore directory.
From now, MOA-ID always use the MOA-SPSS certStore directory for chain building
Diffstat (limited to 'id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java')
-rw-r--r-- | id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java | 66 |
1 files changed, 30 insertions, 36 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java index 969de3ce6..9fc6f799d 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java @@ -59,12 +59,6 @@ import java.util.List; import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moaspss.logging.LoggingContext; import at.gv.egovernment.moaspss.logging.LoggingContextManager; -import iaik.logging.TransactionId; -import iaik.logging.impl.TransactionIdImpl; -import iaik.pki.PKIConfiguration; -import iaik.pki.PKIException; -import iaik.pki.PKIFactory; -import iaik.pki.PKIProfile; import iaik.pki.jsse.IAIKX509TrustManager; @@ -168,35 +162,35 @@ public class MOAIDTrustManager extends IAIKX509TrustManager { return true; } - public void init(PKIConfiguration pkiConfig, PKIProfile pkiProfile) throws PKIException { - if (pkiProfile == null) { - throw new NullPointerException("pkiConfig parameter must not be null"); - - } - - TransactionId tid = new TransactionIdImpl("Init"); - log_.info(tid, "Setting up IAIKX509TrustManager", null); - if (pkiConfig != null) { - PKIFactory.getInstance().configure(pkiConfig, tid); -// log_.info(tid, "Registering LDAP protocol handler", null); -// String protocolHandlers = -// System.getProperty("java.protocol.handler.pkgs"); -// if (protocolHandlers == null) { -// protocolHandlers = "iaik.pki"; -// -// } else { -// protocolHandlers = protocolHandlers + "|iaik.pki"; -// -// } -// -// System.setProperty("java.protocol.handler.pkgs", protocolHandlers); -// log_.info(tid, "Registered protocol handlers: " + protocolHandlers, null); - - } - - pkiProfile_ = pkiProfile; - pkiFactory_ = PKIFactory.getInstance(); - initialized_ = true; - } +// public void init(PKIConfiguration pkiConfig, PKIProfile pkiProfile) throws PKIException { +// if (pkiProfile == null) { +// throw new NullPointerException("pkiConfig parameter must not be null"); +// +// } +// +// TransactionId tid = new TransactionIdImpl("Init"); +// log_.info(tid, "Setting up IAIKX509TrustManager", null); +// if (pkiConfig != null) { +// PKIFactory.getInstance().configure(pkiConfig, tid); +//// log_.info(tid, "Registering LDAP protocol handler", null); +//// String protocolHandlers = +//// System.getProperty("java.protocol.handler.pkgs"); +//// if (protocolHandlers == null) { +//// protocolHandlers = "iaik.pki"; +//// +//// } else { +//// protocolHandlers = protocolHandlers + "|iaik.pki"; +//// +//// } +//// +//// System.setProperty("java.protocol.handler.pkgs", protocolHandlers); +//// log_.info(tid, "Registered protocol handlers: " + protocolHandlers, null); +// +// } +// +// pkiProfile_ = pkiProfile; +// pkiFactory_ = PKIFactory.getInstance(); +// initialized_ = true; +// } } |