diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-07-01 09:21:52 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-07-01 09:21:52 +0200 |
| commit | 66d6cafeea8f1175bbec47bf29abb6933d38d52d (patch) | |
| tree | 583f9f56bf173e420e18a7819ed847bbc0c632d3 /id/server/modules/moa-id-module-openID | |
| parent | 9ea8151676f2c49ef25f4604876a43ac5fd6c045 (diff) | |
| parent | 0b49f1e9e6ee7651758a961438d626b187766f4f (diff) | |
| download | moa-id-spss-66d6cafeea8f1175bbec47bf29abb6933d38d52d.tar.gz moa-id-spss-66d6cafeea8f1175bbec47bf29abb6933d38d52d.tar.bz2 moa-id-spss-66d6cafeea8f1175bbec47bf29abb6933d38d52d.zip | |
Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation
Diffstat (limited to 'id/server/modules/moa-id-module-openID')
2 files changed, 5 insertions, 5 deletions
diff --git a/id/server/modules/moa-id-module-openID/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/json/OAuth20SignatureUtil.java b/id/server/modules/moa-id-module-openID/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/json/OAuth20SignatureUtil.java index 9f20ee956..cd7b8312d 100644 --- a/id/server/modules/moa-id-module-openID/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/json/OAuth20SignatureUtil.java +++ b/id/server/modules/moa-id-module-openID/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/json/OAuth20SignatureUtil.java @@ -54,7 +54,7 @@ public final class OAuth20SignatureUtil { } else if (key instanceof ECPrivateKey) { Logger.debug("OAuth - going to uses SHA256withECDSA signature"); return OAuthSignatureAlgorithm.ECDSA256; - } else if (key instanceof iaik.security.ecc.ecdsa.ECPrivateKey) { + } else if (key instanceof iaik.security.ec.common.ECPrivateKey) { Logger.debug("OAuth - going to uses SHA256withECDSA signature with iaik"); return OAuthSignatureAlgorithm.ECDSA256_IAKIK; } else { @@ -69,7 +69,7 @@ public final class OAuth20SignatureUtil { } else if (key instanceof ECPublicKey) { Logger.debug("OAuth - going to uses SHA256withECDSA signature"); return OAuthSignatureAlgorithm.ECDSA256; - } else if (key instanceof iaik.security.ecc.ecdsa.ECPublicKey) { + } else if (key instanceof iaik.security.ec.common.ECPublicKey) { Logger.debug("OAuth - going to uses SHA256withECDSA signature with iaik"); return OAuthSignatureAlgorithm.ECDSA256_IAKIK; } else { 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 812591293..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 @@ -33,7 +33,7 @@ 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; @@ -119,8 +119,8 @@ public class CertTest { } @Test - public void testECDSA() throws Exception { - ECCelerate.addAsProvider(); + public void testECDSA() throws Exception { + //ECCProvider.addAsProvider(); // Security.addProvider(new ECCProvider()); BasicX509Credential credential = this.getCredentials(this.ecdsaKeyStorePath); |