diff options
author | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 15:30:11 +0200 |
---|---|---|
committer | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 15:30:11 +0200 |
commit | 00201834551ca5bb5a48ccdc67fc60d86b0aaa6b (patch) | |
tree | b5fff339bf0d0c84001cd4216d590c954c29f82f /id/server/moa-id-commons/src/main | |
parent | 66a7c51bbad7e4394c656b627bc0cddf2a063741 (diff) | |
parent | 1d9f9528cba4b85c852aebdffd8699df5f22b302 (diff) | |
download | moa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.tar.gz moa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.tar.bz2 moa-id-spss-00201834551ca5bb5a48ccdc67fc60d86b0aaa6b.zip |
Merge branch 'currenteidas' into moapid-3.2-opb-redis
Conflicts:
id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java
Diffstat (limited to 'id/server/moa-id-commons/src/main')
2 files changed, 10 insertions, 14 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java index dcbec6bf6..d65cea08c 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java @@ -47,8 +47,7 @@ package at.gv.egovernment.moa.id.commons.utils.ssl; import java.io.File; -import java.util.HashMap; -import java.util.Map; +import java.util.Collections; import java.util.Set; import at.gv.egovernment.moa.logging.Logger; @@ -56,7 +55,6 @@ import iaik.pki.store.certstore.CertStoreConfiguration; import iaik.pki.store.certstore.CertStoreParameters; import iaik.pki.store.certstore.CertStoreTypes; import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters; -import iaik.pki.store.certstore.directory.VirtualCertStore; /** * Implementation of interface needed to initialize an IAIK JSSE <code>TrustManager</code> @@ -132,7 +130,7 @@ public class CertStoreConfigurationImpl extends ObservableImpl * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew() */ public boolean createNew() { - return false; + return true; } /** @@ -162,10 +160,8 @@ public class CertStoreConfigurationImpl extends ObservableImpl */ @Override public Set getVirtualStores() { - //TODO: only for Testing and not complete !!!Ask Harald !!!! - - Map<String, VirtualCertStore> vCertStore = new HashMap<String, VirtualCertStore>(); - return vCertStore.keySet(); + //TODO: only for Testing and not complete !!!Ask Harald !!!! + return Collections.EMPTY_SET; } diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java index 40d081ea4..449f77209 100644 --- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java +++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/RevocationConfigurationImpl.java @@ -49,8 +49,6 @@ package at.gv.egovernment.moa.id.commons.utils.ssl; import java.security.cert.X509Certificate; import java.util.Collections; import java.util.Date; -import java.util.HashMap; -import java.util.Map; import java.util.Set; import iaik.pki.revocation.RevocationConfiguration; @@ -98,10 +96,12 @@ public boolean getKeepRevocationInfo() { @Override public Set getPositiveOCSPResponders() { - //TODO: !!!!! ASK Harald !!!!! - Map<String, String> test = new HashMap<String, String>(); - test.put("ALL", "ALL"); - return test.keySet(); +// //TODO: !!!!! ASK Harald !!!!! +// Map<String, String> test = new HashMap<String, String>(); +// test.put("ALL", "ALL"); +// return test.keySet(); + + return Collections.EMPTY_SET; } /* (non-Javadoc) |