aboutsummaryrefslogtreecommitdiff
path: root/id/server/modules/moa-id-module-openID
diff options
context:
space:
mode:
authorChristian Maierhofer <cmaierhofer@iaik.tugraz.at>2016-06-29 15:30:11 +0200
committerChristian Maierhofer <cmaierhofer@iaik.tugraz.at>2016-06-29 15:30:11 +0200
commit00201834551ca5bb5a48ccdc67fc60d86b0aaa6b (patch)
treeb5fff339bf0d0c84001cd4216d590c954c29f82f /id/server/modules/moa-id-module-openID
parent66a7c51bbad7e4394c656b627bc0cddf2a063741 (diff)
parent1d9f9528cba4b85c852aebdffd8699df5f22b302 (diff)
downloadmoa-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/modules/moa-id-module-openID')
-rw-r--r--id/server/modules/moa-id-module-openID/src/test/java/test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java6
1 files changed, 3 insertions, 3 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 22c98b152..35bbac6e7 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
@@ -26,9 +26,6 @@ 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;
@@ -37,6 +34,9 @@ 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 net.oauth.jsontoken.crypto.Signer;
+import net.oauth.jsontoken.crypto.Verifier;
+
public class CertTest {
/** KeyStore Path */