From 08a6d45734bcc3996754fcc8cc7f715600203909 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 28 Jun 2016 16:06:07 +0200 Subject: fix jUnit test in OpenID-Connect module --- .../test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java b/id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java index 6cf1e8280..812591293 100644 --- a/id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java +++ b/id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java @@ -22,15 +22,10 @@ *******************************************************************************/ package test.at.gv.egovernment.moa.id.auth.oauth; -import iaik.security.ecc.provider.ECCProvider; - import java.security.KeyStore; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import net.oauth.jsontoken.crypto.Signer; -import net.oauth.jsontoken.crypto.Verifier; - import org.opensaml.xml.security.x509.BasicX509Credential; import org.testng.Assert; import org.testng.annotations.Test; @@ -38,6 +33,9 @@ import org.testng.annotations.Test; import at.gv.egovernment.moa.id.protocols.oauth20.json.OAuth20SHA256Signer; import at.gv.egovernment.moa.id.protocols.oauth20.json.OAuth20SHA256Verifier; import at.gv.egovernment.moa.util.KeyStoreUtils; +import iaik.security.ec.provider.ECCelerate; +import net.oauth.jsontoken.crypto.Signer; +import net.oauth.jsontoken.crypto.Verifier; public class CertTest { @@ -121,8 +119,8 @@ public class CertTest { } @Test - public void testECDSA() throws Exception { - ECCProvider.addAsProvider(); + public void testECDSA() throws Exception { + ECCelerate.addAsProvider(); // Security.addProvider(new ECCProvider()); BasicX509Credential credential = this.getCredentials(this.ecdsaKeyStorePath); -- cgit v1.2.3 From 3551fb059dc4cda80036ab8bd3ea8794e5620f72 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 28 Jun 2016 16:06:47 +0200 Subject: fix wrong maven repository URL --- id/moa-spss-container/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml index bddc25f71..824b5c555 100644 --- a/id/moa-spss-container/pom.xml +++ b/id/moa-spss-container/pom.xml @@ -12,7 +12,7 @@ This module holds MOA-SPSS and all required library - ${basedir}/../../../repository + ${basedir}/../../repository @@ -35,7 +35,7 @@ maven-compiler-plugin - ${basedir}/../../../repository/MOA/spss/ext_libs/*.jar + ${basedir}/../../repository/MOA/spss/ext_libs/*.jar -- cgit v1.2.3 From 2c06447686dfae609503b24c2711223888bead82 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 29 Jun 2016 14:36:26 +0200 Subject: small change in SSLTrustManager CertStore config --- .../moa/id/commons/utils/ssl/CertStoreConfigurationImpl.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 TrustManager @@ -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 vCertStore = new HashMap(); - return vCertStore.keySet(); + //TODO: only for Testing and not complete !!!Ask Harald !!!! + return Collections.EMPTY_SET; } -- cgit v1.2.3 From 1d9f9528cba4b85c852aebdffd8699df5f22b302 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 29 Jun 2016 15:14:39 +0200 Subject: some additional SSLTrustManager update --- .../id/commons/utils/ssl/RevocationConfigurationImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 test = new HashMap(); - test.put("ALL", "ALL"); - return test.keySet(); +// //TODO: !!!!! ASK Harald !!!!! +// Map test = new HashMap(); +// test.put("ALL", "ALL"); +// return test.keySet(); + + return Collections.EMPTY_SET; } /* (non-Javadoc) -- cgit v1.2.3