[java-idp-oidc] branch main updated: JCOMOIDC-6 Move common crypto/security code from the OIDC plugin
Henri Mikkonen
henri.mikkonen at iki.fi
Fri Nov 13 14:31:24 UTC 2020
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=8ff98a28470b8f50150674e62d9095e3244d3ec8
The following commit(s) were added to refs/heads/main by this push:
new 8ff98a28 JCOMOIDC-6 Move common crypto/security code from the OIDC plugin
8ff98a28 is described below
commit 8ff98a28470b8f50150674e62d9095e3244d3ec8
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Nov 13 16:30:12 2020 +0200
JCOMOIDC-6 Move common crypto/security code from the OIDC plugin
https://issues.shibboleth.net/jira/browse/JCOMOIDC-6
JWA algorithm descriptors, credential extensions and some utility
classes moved into java-oidc-commons.
---
.../descriptors/EncryptionA128CBC_HS256.java | 73 ------------
.../algorithm/descriptors/EncryptionA128GCM.java | 72 ------------
.../descriptors/EncryptionA192CBC_HS384.java | 73 ------------
.../algorithm/descriptors/EncryptionA192GCM.java | 72 ------------
.../descriptors/EncryptionA256CBC_HS512.java | 73 ------------
.../algorithm/descriptors/EncryptionA256GCM.java | 72 ------------
.../algorithm/descriptors/KeyAgreementECDH_ES.java | 84 --------------
.../algorithm/descriptors/KeyTransportRSA1_5.java | 74 -------------
.../descriptors/KeyTransportRSA_OAEP.java | 75 -------------
.../descriptors/KeyTransportRSA_OAEP_256.java | 75 -------------
.../oidc/algorithm/descriptors/SignatureES256.java | 60 ----------
.../oidc/algorithm/descriptors/SignatureES384.java | 60 ----------
.../oidc/algorithm/descriptors/SignatureES512.java | 60 ----------
.../oidc/algorithm/descriptors/SignatureHS256.java | 54 ---------
.../oidc/algorithm/descriptors/SignatureHS384.java | 54 ---------
.../oidc/algorithm/descriptors/SignatureHS512.java | 54 ---------
.../oidc/algorithm/descriptors/SignatureRS256.java | 60 ----------
.../oidc/algorithm/descriptors/SignatureRS384.java | 60 ----------
.../oidc/algorithm/descriptors/SignatureRS512.java | 60 ----------
.../descriptors/SymmetricKeyWrapA128GCMKW.java | 65 -----------
.../descriptors/SymmetricKeyWrapA128KW.java | 65 -----------
.../descriptors/SymmetricKeyWrapA192GCMKW.java | 64 -----------
.../descriptors/SymmetricKeyWrapA192KW.java | 65 -----------
.../descriptors/SymmetricKeyWrapA256GCMKW.java | 65 -----------
.../descriptors/SymmetricKeyWrapA256KW.java | 65 -----------
.../oidc/algorithm/descriptors/package-info.java | 18 ---
.../oidc/crypto/support/EncryptionConstants.java | 47 --------
.../oidc/crypto/support/JCAConstantExtension.java | 40 -------
.../crypto/support/KeyManagementConstants.java | 80 --------------
.../oidc/crypto/support/SignatureConstants.java | 67 -----------
.../oidc/crypto/support/package-info.java | 17 ---
.../org/geant/security/jwk/BasicJWKCredential.java | 63 -----------
.../security/jwk/BasicJWKReferenceCredential.java | 70 ------------
.../security/jwk/BasicNimbusSecretCredential.java | 70 ------------
.../java/org/geant/security/jwk/JWKCredential.java | 43 --------
.../geant/security/jwk/JWKReferenceCredential.java | 36 ------
.../geant/security/jwk/NimbusSecretCredential.java | 38 -------
.../java/org/geant/security/jwk/package-info.java | 17 ---
...g.opensaml.xmlsec.algorithm.AlgorithmDescriptor | 24 ----
.../descriptors/EncryptionA128CBC_HS256Test.java | 44 --------
.../descriptors/EncryptionA128GCMTest.java | 43 --------
.../descriptors/EncryptionA192CBC_HS384Test.java | 44 --------
.../descriptors/EncryptionA192GCMTest.java | 43 --------
.../descriptors/EncryptionA256CBC_HS512Test.java | 44 --------
.../descriptors/EncryptionA256GCMTest.java | 43 --------
.../descriptors/KeyTransportRSA1_5Test.java | 43 --------
.../descriptors/KeyTransportRSA_OAEPTest.java | 43 --------
.../descriptors/KeyTransportRSA_OAEP_256Test.java | 43 --------
.../algorithm/descriptors/SignatureES256Test.java | 42 -------
.../algorithm/descriptors/SignatureES384Test.java | 42 -------
.../algorithm/descriptors/SignatureES512Test.java | 42 -------
.../algorithm/descriptors/SignatureHS256Test.java | 41 -------
.../algorithm/descriptors/SignatureHS384Test.java | 41 -------
.../algorithm/descriptors/SignatureHS512Test.java | 41 -------
.../algorithm/descriptors/SignatureRS256Test.java | 42 -------
.../algorithm/descriptors/SignatureRS384Test.java | 42 -------
.../algorithm/descriptors/SignatureRS512Test.java | 42 -------
.../descriptors/SymmetricKeyWrapA128GCMKWTest.java | 42 -------
.../descriptors/SymmetricKeyWrapA128KWTest.java | 43 --------
.../descriptors/SymmetricKeyWrapA192GCMKWTest.java | 42 -------
.../descriptors/SymmetricKeyWrapA192KWTest.java | 42 -------
.../descriptors/SymmetricKeyWrapA256GCMKWTest.java | 42 -------
.../descriptors/SymmetricKeyWrapA256KWTest.java | 42 -------
.../geant/security/jwk/BasicJWKCredentialTest.java | 51 ---------
.../src/main/resources/conf/oidc-relying-party.xml | 114 +++++++++----------
idp-oidc-extension-impl/pom.xml | 8 ++
.../ext/impl/provider/ClientSecretProvider.java | 4 +-
.../provider/ClientSecretReferenceProvider.java | 4 +-
.../ext/impl/provider/InlineJwksProvider.java | 6 +-
.../ext/impl/provider/JWKSReferenceProvider.java | 4 +-
.../impl/ClientInformationNodeProcessor.java | 4 +-
.../impl/CredentialMetadataValueResolver.java | 2 +-
.../oidc/profile/impl/AbstractSignJWTAction.java | 5 +-
...bjectSecurityConfigurationToClientMetadata.java | 2 +-
.../AddSecurityConfigurationToClientMetadata.java | 2 +-
.../oidc/profile/impl/EncryptProcessedToken.java | 2 +-
.../impl/FormOutboundKeySetResponseMessage.java | 2 +-
.../profile/impl/SignRegistrationResponse.java | 4 +-
.../factory/BasicJWKCredentialFactoryBean.java | 4 +-
.../security/impl/CredentialConversionUtil.java | 122 ---------------------
.../security/impl/JWTSignatureValidationUtil.java | 3 +-
...entInformationEncryptionParametersResolver.java | 2 +-
...ormationSignatureSigningParametersResolver.java | 2 +-
...ationSignatureValidationParametersResolver.java | 2 +-
.../impl/OIDCSignatureValidationParameters.java | 3 +-
...tSecurityConfigurationToClientMetadataTest.java | 6 +-
...dSecurityConfigurationToClientMetadataTest.java | 6 +-
.../profile/impl/DecryptRequestObjectTest.java | 2 +-
.../profile/impl/EncryptProcessedTokenTest.java | 2 +-
.../impl/ValidateEndpointAuthenticationTest.java | 2 +-
.../profile/impl/ValidateRequestObjectTest.java | 2 +-
.../src/test/resources/conf/oidc-relying-party.xml | 114 +++++++++----------
pom.xml | 10 ++
93 files changed, 172 insertions(+), 3626 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128CBC_HS256.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128CBC_HS256.java
deleted file mode 100644
index 4fd2776b..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128CBC_HS256.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.BlockEncryptionAlgorithm;
-
-/**
- * Algorithm descriptor for block encryption algorithm: A128CBC-HS256.
- */
-public final class EncryptionA128CBC_HS256 implements BlockEncryptionAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.BlockEncryption;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public Integer getKeyLength() {
- return 128;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_CBC;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getPadding() {
- return JCAConstantExtension.CIPHER_PADDING_PKCS5;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128GCM.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128GCM.java
deleted file mode 100644
index 8c39cb4c..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128GCM.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.BlockEncryptionAlgorithm;
-
-/**
- * Algorithm descriptor for block encryption algorithm: 128GCM.
- */
-public final class EncryptionA128GCM implements BlockEncryptionAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.BlockEncryption;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public Integer getKeyLength() {
- return 128;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_GCM;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getPadding() {
- return JCAConstants.CIPHER_PADDING_NONE;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192CBC_HS384.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192CBC_HS384.java
deleted file mode 100644
index ccd45a5e..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192CBC_HS384.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.BlockEncryptionAlgorithm;
-
-/**
- * Algorithm descriptor for block encryption algorithm: A192CBC-HS384.
- */
-public final class EncryptionA192CBC_HS384 implements BlockEncryptionAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.BlockEncryption;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public Integer getKeyLength() {
- return 192;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_CBC;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getPadding() {
- return JCAConstantExtension.CIPHER_PADDING_PKCS5;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192GCM.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192GCM.java
deleted file mode 100644
index 315c15cf..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192GCM.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.BlockEncryptionAlgorithm;
-
-/**
- * Algorithm descriptor for block encryption algorithm: 192GCM.
- */
-public final class EncryptionA192GCM implements BlockEncryptionAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.BlockEncryption;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public Integer getKeyLength() {
- return 192;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_GCM;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getPadding() {
- return JCAConstants.CIPHER_PADDING_NONE;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256CBC_HS512.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256CBC_HS512.java
deleted file mode 100644
index f7840e9b..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256CBC_HS512.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.BlockEncryptionAlgorithm;
-
-/**
- * Algorithm descriptor for block encryption algorithm: A256CBC-HS512.
- */
-public final class EncryptionA256CBC_HS512 implements BlockEncryptionAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.BlockEncryption;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public Integer getKeyLength() {
- return 256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_CBC;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getPadding() {
- return JCAConstantExtension.CIPHER_PADDING_PKCS5;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256GCM.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256GCM.java
deleted file mode 100644
index 8cbf5738..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256GCM.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.BlockEncryptionAlgorithm;
-
-/**
- * Algorithm descriptor for block encryption algorithm: 256GCM.
- */
-public final class EncryptionA256GCM implements BlockEncryptionAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.BlockEncryption;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public Integer getKeyLength() {
- return 256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_GCM;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getPadding() {
- return JCAConstants.CIPHER_PADDING_NONE;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyAgreementECDH_ES.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyAgreementECDH_ES.java
deleted file mode 100644
index 8939c234..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyAgreementECDH_ES.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.KeyAgreementAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key management algorithm: ECDH-ES.
- *
- */
-public class KeyAgreementECDH_ES implements KeyAgreementAlgorithm {
-
- /**
- * Get the key algorithm.
- * @return The key algorithm.
- */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_EC;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_ECDH_ES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.KeyAgreement;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /**
- * Get the cipher mode.
- * @return The cipher mode.
- */
- @Nonnull
- @NotEmpty
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_ECB;
- }
-
- /**
- * Get the cipher padding.
- * @return The cipher padding.
- */
- @Nonnull
- @NotEmpty
- public String getPadding() {
- //TODO: Verify padding scheme value
- return JCAConstants.CIPHER_PADDING_PKCS1;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA1_5.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA1_5.java
deleted file mode 100644
index 5ca3cc76..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA1_5.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.KeyTransportAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key transport algorithm: RSA1_5.
- *
- */
-public class KeyTransportRSA1_5 implements KeyTransportAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_RSA;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_RSA_1_5;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.KeyTransport;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_ECB;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getPadding() {
- return JCAConstants.CIPHER_PADDING_PKCS1;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP.java
deleted file mode 100644
index 1fc2fb2d..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.KeyTransportAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key transport algorithm: RSA-OAEP.
- *
- */
-public class KeyTransportRSA_OAEP implements KeyTransportAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_RSA;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.KeyTransport;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_ECB;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getPadding() {
- return JCAConstantExtension.CIPHER_PADDING_OAEP;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP_256.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP_256.java
deleted file mode 100644
index 666c9443..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP_256.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.KeyTransportAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key transport algorithm: RSA-OAEP-256.
- *
- */
-public class KeyTransportRSA_OAEP_256 implements KeyTransportAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_RSA;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.KeyTransport;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getJCAAlgorithmID() {
- return String.format("%s/%s/%s", getKey(), getCipherMode(), getPadding());
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getCipherMode() {
- return JCAConstants.CIPHER_MODE_ECB;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getPadding() {
- return JCAConstantExtension.CIPHER_PADDING_OAEP_256;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES256.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES256.java
deleted file mode 100644
index ad3b99aa..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES256.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SignatureAlgorithm;
-
-/**
- * Algorithm descriptor for signature algorithm: ES256.
- */
-public final class SignatureES256 implements SignatureAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_EC;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_ES_256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Signature;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.SIGNATURE_ECDSA_SHA256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA256;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES384.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES384.java
deleted file mode 100644
index ecfb87c7..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES384.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SignatureAlgorithm;
-
-/**
- * Algorithm descriptor for signature algorithm: ES384.
- */
-public final class SignatureES384 implements SignatureAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_EC;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_ES_384;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Signature;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.SIGNATURE_ECDSA_SHA384;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA384;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES512.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES512.java
deleted file mode 100644
index 08d488df..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES512.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SignatureAlgorithm;
-
-/**
- * Algorithm descriptor for signature algorithm: ES512.
- */
-public final class SignatureES512 implements SignatureAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_EC;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_ES_512;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Signature;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.SIGNATURE_ECDSA_SHA512;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA512;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS256.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS256.java
deleted file mode 100644
index 27f7cb86..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS256.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.MACAlgorithm;
-
-/**
- * Algorithm descriptor for HMAC algorithm: HS256.
- */
-public final class SignatureHS256 implements MACAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_HS_256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Mac;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.HMAC_SHA256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA256;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS384.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS384.java
deleted file mode 100644
index 9b155ed1..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS384.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.MACAlgorithm;
-
-/**
- * Algorithm descriptor for HMAC algorithm: HS384.
- */
-public final class SignatureHS384 implements MACAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_HS_384;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Mac;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.HMAC_SHA384;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA384;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS512.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS512.java
deleted file mode 100644
index ea35159c..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS512.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.MACAlgorithm;
-
-/**
- * Algorithm descriptor for HMAC algorithm: HS512.
- */
-public final class SignatureHS512 implements MACAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_HS_512;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Mac;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.HMAC_SHA512;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA512;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS256.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS256.java
deleted file mode 100644
index 50d31535..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS256.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SignatureAlgorithm;
-
-/**
- * Algorithm descriptor for signature algorithm: RS256.
- */
-public final class SignatureRS256 implements SignatureAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_RSA;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_RS_256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Signature;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.SIGNATURE_RSA_SHA256;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA256;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS384.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS384.java
deleted file mode 100644
index 7300fa42..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS384.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SignatureAlgorithm;
-
-/**
- * Algorithm descriptor for signature algorithm: RS384.
- */
-public final class SignatureRS384 implements SignatureAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_RSA;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_RS_384;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Signature;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.SIGNATURE_RSA_SHA384;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA384;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS512.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS512.java
deleted file mode 100644
index 3df76603..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS512.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SignatureAlgorithm;
-
-/**
- * Algorithm descriptor for signature algorithm: RS512.
- */
-public final class SignatureRS512 implements SignatureAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- public String getKey() {
- return JCAConstants.KEY_ALGO_RSA;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getURI() {
- return SignatureConstants.ALGO_ID_SIGNATURE_RS_512;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.Signature;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.SIGNATURE_RSA_SHA512;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getDigest() {
- return JCAConstants.DIGEST_SHA512;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128GCMKW.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128GCMKW.java
deleted file mode 100644
index 1d2b2c51..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128GCMKW.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SymmetricKeyWrapAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key management algorithm: AES128GCMKW.
- *
- */
-public class SymmetricKeyWrapA128GCMKW implements SymmetricKeyWrapAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.SymmetricKeyWrap;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.KEYWRAP_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Override
- public Integer getKeyLength() {
- return 128;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128KW.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128KW.java
deleted file mode 100644
index 56761b38..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128KW.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SymmetricKeyWrapAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key management algorithm: AES128KW.
- *
- */
-public class SymmetricKeyWrapA128KW implements SymmetricKeyWrapAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_AES_128_KW;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.SymmetricKeyWrap;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.KEYWRAP_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Override
- public Integer getKeyLength() {
- return 128;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192GCMKW.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192GCMKW.java
deleted file mode 100644
index cb08105b..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192GCMKW.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SymmetricKeyWrapAlgorithm;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key management algorithm: AES192GCMKW.
- *
- */
-public class SymmetricKeyWrapA192GCMKW implements SymmetricKeyWrapAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.SymmetricKeyWrap;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.KEYWRAP_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Override
- public Integer getKeyLength() {
- return 192;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192KW.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192KW.java
deleted file mode 100644
index 70fca6bb..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192KW.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SymmetricKeyWrapAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key management algorithm: AES192KW.
- *
- */
-public class SymmetricKeyWrapA192KW implements SymmetricKeyWrapAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_AES_192_KW;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.SymmetricKeyWrap;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.KEYWRAP_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Override
- public Integer getKeyLength() {
- return 192;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256GCMKW.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256GCMKW.java
deleted file mode 100644
index 22cccdf7..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256GCMKW.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SymmetricKeyWrapAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key management algorithm: AES256GCMKW.
- *
- */
-public class SymmetricKeyWrapA256GCMKW implements SymmetricKeyWrapAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.SymmetricKeyWrap;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.KEYWRAP_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Override
- public Integer getKeyLength() {
- return 256;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256KW.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256KW.java
deleted file mode 100644
index 7e8aa5f7..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256KW.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import javax.annotation.Nonnull;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.SymmetricKeyWrapAlgorithm;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Algorithm descriptor for JWE key management algorithm: AES256KW.
- *
- */
-public class SymmetricKeyWrapA256KW implements SymmetricKeyWrapAlgorithm {
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getKey() {
- return JCAConstants.KEY_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- @NotEmpty
- public String getURI() {
- return KeyManagementConstants.ALGO_ID_ALG_AES_256_KW;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public AlgorithmType getType() {
- return AlgorithmType.SymmetricKeyWrap;
- }
-
- /** {@inheritDoc} */
- @Nonnull
- public String getJCAAlgorithmID() {
- return JCAConstants.KEYWRAP_ALGO_AES;
- }
-
- /** {@inheritDoc} */
- @Override
- public Integer getKeyLength() {
- return 256;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/package-info.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/package-info.java
deleted file mode 100644
index c46f9185..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/algorithm/descriptors/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** OIDC Signing/Encryption Algorithms. */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/EncryptionConstants.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/EncryptionConstants.java
deleted file mode 100644
index 4584aa07..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/EncryptionConstants.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.crypto.support;
-
-/** Algorithm Header Parameter 'enc' Values for JWE as defined by RFC 7518. */
-public final class EncryptionConstants {
-
- /** Encryption - Required- A128CBC-HS256. */
- public static final String ALGO_ID_ENC_ALG_A128CBC_HS256 = "A128CBC-HS256";
-
- /** Encryption - Optional- A192CBC-HS384. */
- public static final String ALGO_ID_ENC_ALG_A192CBC_HS384 = "A192CBC-HS384";
-
- /** Encryption -Required- A256CBC-HS512. */
- public static final String ALGO_ID_ENC_ALG_A256CBC_HS512 = "A256CBC-HS512";
-
- /** Encryption -Recommended- A128GCM. */
- public static final String ALGO_ID_ENC_ALG_A128GCM = "A128GCM";
-
- /** Encryption -Optional- A192GCM. */
- public static final String ALGO_ID_ENC_ALG_A192GCM = "A192GCM";
-
- /** Encryption -Recommended- A256GCM. */
- public static final String ALGO_ID_ENC_ALG_A256GCM = "A256GCM";
-
- /**
- * Constructor.
- */
- private EncryptionConstants() {
- // no op
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/JCAConstantExtension.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/JCAConstantExtension.java
deleted file mode 100644
index 1aa0e5b6..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/JCAConstantExtension.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.geant.idpextension.oidc.crypto.support;
-
-import org.opensaml.security.crypto.JCAConstants;
-
-/**
- * Additional constants to {@link JCAConstants} defined in and/or used with the
- * Java Cryptography Architecture (JCA) specification.
- */
-public final class JCAConstantExtension {
-
- /** Cipher padding: "PKCS5Padding". */
- public static final String CIPHER_PADDING_PKCS5 = "PKCS5Padding";
-
- /** Cipher padding "OAEP". */
- public static final String CIPHER_PADDING_OAEP = "OAEPWithSHA-1AndMGF1Padding";
-
- /** Cipher padding "OAEP-256". */
- public static final String CIPHER_PADDING_OAEP_256 = "OAEPWithSHA-256AndMGF1Padding";
-
- /** Private constructor. */
- private JCAConstantExtension() {
-
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/KeyManagementConstants.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/KeyManagementConstants.java
deleted file mode 100644
index bdb8dd74..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/KeyManagementConstants.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.crypto.support;
-
-/** Algorithm Header Parameter 'alg' Values for JWE as defined by RFC 7518. */
-public final class KeyManagementConstants {
-
- /** Encryption - Recommended- RSAES-PKCS1-v1_5. */
- public static final String ALGO_ID_ALG_RSA_1_5 = "RSA1_5";
-
- /** Encryption - Recommended+ RSAES OAEP using default parameters. */
- public static final String ALGO_ID_ALG_RSA_OAEP = "RSA-OAEP";
-
- /** Encryption - Optional RSAES OAEP using SHA-256 and MGF1 with SHA-256. */
- public static final String ALGO_ID_ALG_RSA_OAEP_256 = "RSA-OAEP-256";
-
- /** Encryption - Recommended AES Key Wrap with default initial value using 128-bit key. */
- public static final String ALGO_ID_ALG_AES_128_KW = "A128KW";
-
- /** Encryption - Optional AES Key Wrap with default initial value using 192-bit key. */
- public static final String ALGO_ID_ALG_AES_192_KW = "A192KW";
-
- /** Encryption - Recommended AES Key Wrap with default initial value using 256-bit key. */
- public static final String ALGO_ID_ALG_AES_256_KW = "A256KW";
-
- /** Encryption - Recommended Direct use of a shared symmetric key as the CEK. */
- public static final String ALGO_ID_ALG_DIR = "dir";
-
- /** Encryption - Recommended+ Elliptic Curve Diffie-Helman Ephemeral Static key agreement. */
- public static final String ALGO_ID_ALG_ECDH_ES = "ECDH-ES";
-
- /** Encryption - Recommended ECDH-ES using Concat KDF and CEK wrapped with A128KW. */
- public static final String ALGO_ID_ALG_ECDH_ES_AES_128_KW = "ECDH-ES+A128KW";
-
- /** Encryption - Optional ECDH-ES using Concat KDF and CEK wrapped with A192KW. */
- public static final String ALGO_ID_ALG_ECDH_ES_AES_192_KW = "ECDH-ES+A192KW";
-
- /** Encryption - Recommended ECDH-ES using Concat KDF and CEK wrapped with A256KW. */
- public static final String ALGO_ID_ALG_ECDH_ES_AES_256_KW = "ECDH-ES+A256KW";
-
- /** Encryption - Optional key wrapping with AES GCM using 128-bit key. */
- public static final String ALGO_ID_ALG_AES_128_GCM_KW = "A128GCMKW";
-
- /** Encryption - Optional key wrapping with AES GCM using 192-bit key. */
- public static final String ALGO_ID_ALG_AES_192_GCM_KW = "A192GCMKW";
-
- /** Encryption - Optional key wrapping with AES GCM using 256-bit key. */
- public static final String ALGO_ID_ALG_AES_256_GCM_KW = "A256GCMKW";
-
- /** Encryption - Optional PBES2 with HMAC SHA-256 and A128KW wrapping. */
- public static final String ALGO_ID_ALG_PBES2_HS_256_AES_128_KW = "PBES2-HS256+A128KW";
-
- /** Encryption - Optional PBES2 with HMAC SHA-538 and A192KW wrapping. */
- public static final String ALGO_ID_ALG_PBES2_HS_384_AES_192_KW = "PBES2-HS384+A192KW";
-
- /** Encryption - Optional PBES2 with HMAC SHA-512 and A256KW wrapping. */
- public static final String ALGO_ID_ALG_PBES2_HS_512_AES_256_KW = "PBES2-HS512+A256KW";
-
- /**
- * Constructor.
- */
- private KeyManagementConstants() {
- // no op
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/SignatureConstants.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/SignatureConstants.java
deleted file mode 100644
index 66e5270e..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/SignatureConstants.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.crypto.support;
-
-/** Algorithm Header Parameter Values for JWS. */
-public final class SignatureConstants {
-
- /** Signature - Required HS256. */
- public static final String ALGO_ID_SIGNATURE_HS_256 = "HS256";
-
- /** Signature - Optional HS384. */
- public static final String ALGO_ID_SIGNATURE_HS_384 = "HS384";
-
- /** Signature - Optional HS512. */
- public static final String ALGO_ID_SIGNATURE_HS_512 = "HS512";
-
- /** Signature - Recommended RS256. */
- public static final String ALGO_ID_SIGNATURE_RS_256 = "RS256";
-
- /** Signature - Optional RS384. */
- public static final String ALGO_ID_SIGNATURE_RS_384 = "RS384";
-
- /** Signature - Optional RS512. */
- public static final String ALGO_ID_SIGNATURE_RS_512 = "RS512";
-
- /** Signature - Recommended+ ES256. */
- public static final String ALGO_ID_SIGNATURE_ES_256 = "ES256";
-
- /** Signature - Optional ES384. */
- public static final String ALGO_ID_SIGNATURE_ES_384 = "ES384";
-
- /** Signature - Optional ES512. */
- public static final String ALGO_ID_SIGNATURE_ES_512 = "ES512";
-
- /** Signature - Optional PS256. */
- public static final String ALGO_ID_SIGNATURE_PS_256 = "PS256";
-
- /** Signature - Optional PS384. */
- public static final String ALGO_ID_SIGNATURE_PS_384 = "PS384";
-
- /** Signature - Optional PS512. */
- public static final String ALGO_ID_SIGNATURE_PS_512 = "PS512";
-
- /** No Signature. */
- public static final String ALGO_ID_SIGNATURE_NONE = "none";
-
- /**
- * Constructor.
- */
- private SignatureConstants() {
- // no op
- }
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/package-info.java b/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/package-info.java
deleted file mode 100644
index 86fdddb0..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/idpextension/oidc/crypto/support/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** Constants related to OIDC crypto features, like signature and ecryption.*/
-package org.geant.idpextension.oidc.crypto.support;
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicJWKCredential.java b/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicJWKCredential.java
deleted file mode 100644
index d92a15d3..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicJWKCredential.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.security.jwk;
-
-import org.opensaml.security.credential.BasicCredential;
-import com.nimbusds.jose.Algorithm;
-
-/**
- * A basic implementation of {@link JWKCredential}.
- */
-public class BasicJWKCredential extends BasicCredential implements JWKCredential {
-
- /** jwk algorithm. */
- private Algorithm jwkAlgorithm;
-
- /** jwk kid. */
- private String jwkKid;
-
- /**
- * Set the kid of jwk.
- *
- * @param kid kid of jwk
- */
- public void setKid(final String kid) {
- jwkKid = kid;
- }
-
- /** {@inheritDoc} */
- @Override
- public String getKid() {
- return jwkKid;
- }
-
- /**
- * Set the algorithm of jwk.
- *
- * @param algorithm algorithm of jwk.
- */
- public void setAlgorithm(final Algorithm algorithm) {
- jwkAlgorithm = algorithm;
- }
-
- /** {@inheritDoc} */
- @Override
- public Algorithm getAlgorithm() {
- return jwkAlgorithm;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicJWKReferenceCredential.java b/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicJWKReferenceCredential.java
deleted file mode 100644
index bcaa2418..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicJWKReferenceCredential.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.security.jwk;
-
-import java.net.URI;
-
-import org.opensaml.security.credential.AbstractCredential;
-import org.opensaml.security.credential.Credential;
-
-/**
- * A basic implementation of {@link JWKReferenceCredential}.
- */
-public class BasicJWKReferenceCredential extends AbstractCredential implements JWKReferenceCredential {
-
- /** A reference to a JWK. */
- private URI referenceUri;
-
- /**
- * Constructor.
- */
- public BasicJWKReferenceCredential() {
- super();
- }
-
- /**
- * Constructor.
- *
- * @param uri A reference to a JWK.
- */
- public BasicJWKReferenceCredential(final URI uri) {
- this();
- referenceUri = uri;
- }
-
- /**
- * Set the reference to a JWK.
- *
- * @param uri What to set.
- */
- public void setReferenceURI(final URI uri) {
- referenceUri = uri;
- }
-
- /** {@inheritDoc} */
- @Override
- public URI getReferenceURI() {
- return referenceUri;
- }
-
- /** {@inheritDoc} */
- @Override
- public Class<? extends Credential> getCredentialType() {
- return JWKReferenceCredential.class;
- }
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicNimbusSecretCredential.java b/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicNimbusSecretCredential.java
deleted file mode 100644
index 8c5c3fbe..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/BasicNimbusSecretCredential.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.security.jwk;
-
-import org.opensaml.security.credential.AbstractCredential;
-import org.opensaml.security.credential.Credential;
-
-import com.nimbusds.oauth2.sdk.auth.Secret;
-
-/**
- * A basic implementation of {@link NimbusSecretCredential}.
- */
-public class BasicNimbusSecretCredential extends AbstractCredential implements NimbusSecretCredential {
-
- /** The client secret. */
- private Secret clientSecret;
-
- /**
- * Constructor.
- */
- public BasicNimbusSecretCredential() {
- super();
- }
-
- /**
- * Constructor.
- *
- * @param secret The client secret.
- */
- public BasicNimbusSecretCredential(final Secret secret) {
- this();
- clientSecret = secret;
- }
-
- /**
- * Set the client secret.
- *
- * @param secret What to set.
- */
- public void setSecret(final Secret secret) {
- clientSecret = secret;
- }
-
- /** {@inheritDoc} */
- @Override
- public Secret getSecret() {
- return clientSecret;
- }
-
- /** {@inheritDoc} */
- @Override
- public Class<? extends Credential> getCredentialType() {
- return NimbusSecretCredential.class;
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/JWKCredential.java b/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/JWKCredential.java
deleted file mode 100644
index 4adf2b95..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/JWKCredential.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.security.jwk;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opensaml.security.credential.Credential;
-import com.nimbusds.jose.Algorithm;
-
-/** Credential based on JSON Web Key (JWK). */
-public interface JWKCredential extends Credential {
-
- /**
- * Get kid of JWK.
- *
- * @return kid parameter.
- */
- @Nullable
- public String getKid();
-
- /**
- * Get algorithm of JWK.
- *
- * @return algorithm of JWK.
- */
- @Nonnull
- public Algorithm getAlgorithm();
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/JWKReferenceCredential.java b/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/JWKReferenceCredential.java
deleted file mode 100644
index fa19a9de..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/JWKReferenceCredential.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.security.jwk;
-
-import java.net.URI;
-
-import javax.annotation.Nonnull;
-
-import org.opensaml.security.credential.Credential;
-
-/** Credential based on a reference (URI) to a JSON Web Key (JWK). */
-public interface JWKReferenceCredential extends Credential {
-
- /**
- * Get the reference URI to the remote JWK.
- *
- * @return The reference URI to the remote JWK.
- */
- @Nonnull
- public URI getReferenceURI();
-
-}
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/NimbusSecretCredential.java b/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/NimbusSecretCredential.java
deleted file mode 100644
index 736d3073..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/NimbusSecretCredential.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.security.jwk;
-
-import javax.annotation.Nonnull;
-
-import org.opensaml.security.credential.Credential;
-
-import com.nimbusds.oauth2.sdk.auth.Secret;
-
-/**
- * Credential wrapping {@link Secret}.
- */
-public interface NimbusSecretCredential extends Credential {
-
- /**
- * Get the client secret.
- *
- * @return The client secret.
- */
- @Nonnull
- public Secret getSecret();
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/package-info.java b/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/package-info.java
deleted file mode 100644
index e10c0a49..00000000
--- a/idp-oidc-extension-api/src/main/java/org/geant/security/jwk/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/** JWK Credentials.*/
-package org.geant.security.jwk;
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/main/resources/META-INF/services/org.opensaml.xmlsec.algorithm.AlgorithmDescriptor b/idp-oidc-extension-api/src/main/resources/META-INF/services/org.opensaml.xmlsec.algorithm.AlgorithmDescriptor
deleted file mode 100644
index c525a6e1..00000000
--- a/idp-oidc-extension-api/src/main/resources/META-INF/services/org.opensaml.xmlsec.algorithm.AlgorithmDescriptor
+++ /dev/null
@@ -1,24 +0,0 @@
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureRS256
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureRS384
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureRS512
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureES256
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureES384
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureES512
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureHS256
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureHS384
-org.geant.idpextension.oidc.algorithm.descriptors.SignatureHS512
-org.geant.idpextension.oidc.algorithm.descriptors.KeyTransportRSA1_5
-org.geant.idpextension.oidc.algorithm.descriptors.KeyTransportRSA_OAEP
-org.geant.idpextension.oidc.algorithm.descriptors.KeyTransportRSA_OAEP_256
-org.geant.idpextension.oidc.algorithm.descriptors.SymmetricKeyWrapA128KW
-org.geant.idpextension.oidc.algorithm.descriptors.SymmetricKeyWrapA192KW
-org.geant.idpextension.oidc.algorithm.descriptors.SymmetricKeyWrapA256KW
-org.geant.idpextension.oidc.algorithm.descriptors.SymmetricKeyWrapA128GCMKW
-org.geant.idpextension.oidc.algorithm.descriptors.SymmetricKeyWrapA192GCMKW
-org.geant.idpextension.oidc.algorithm.descriptors.SymmetricKeyWrapA256GCMKW
-org.geant.idpextension.oidc.algorithm.descriptors.EncryptionA128CBC_HS256
-org.geant.idpextension.oidc.algorithm.descriptors.EncryptionA128GCM
-org.geant.idpextension.oidc.algorithm.descriptors.EncryptionA192CBC_HS384
-org.geant.idpextension.oidc.algorithm.descriptors.EncryptionA192GCM
-org.geant.idpextension.oidc.algorithm.descriptors.EncryptionA256CBC_HS512
-org.geant.idpextension.oidc.algorithm.descriptors.EncryptionA256GCM
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128CBC_HS256Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128CBC_HS256Test.java
deleted file mode 100644
index f492c9a2..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128CBC_HS256Test.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link EncryptionA128CBC_HS256}
- */
-public class EncryptionA128CBC_HS256Test {
-
- private EncryptionA128CBC_HS256 algorithm = new EncryptionA128CBC_HS256();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.BlockEncryption, algorithm.getType());
- Assert.assertEquals("AES/CBC/PKCS5Padding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(128), algorithm.getKeyLength());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_CBC, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstantExtension.CIPHER_PADDING_PKCS5, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128GCMTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128GCMTest.java
deleted file mode 100644
index c1450321..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA128GCMTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link EncryptionA128GCM}
- */
-public class EncryptionA128GCMTest {
-
- private EncryptionA128GCM algorithm = new EncryptionA128GCM();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.BlockEncryption, algorithm.getType());
- Assert.assertEquals("AES/GCM/NoPadding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(128), algorithm.getKeyLength());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_GCM, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstants.CIPHER_PADDING_NONE, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192CBC_HS384Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192CBC_HS384Test.java
deleted file mode 100644
index e9678e3b..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192CBC_HS384Test.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link EncryptionA192CBC_HS384}
- */
-public class EncryptionA192CBC_HS384Test {
-
- private EncryptionA192CBC_HS384 algorithm = new EncryptionA192CBC_HS384();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.BlockEncryption, algorithm.getType());
- Assert.assertEquals("AES/CBC/PKCS5Padding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(192), algorithm.getKeyLength());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_CBC, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstantExtension.CIPHER_PADDING_PKCS5, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192GCMTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192GCMTest.java
deleted file mode 100644
index 189cbaa4..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA192GCMTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link EncryptionA192GCM}
- */
-public class EncryptionA192GCMTest {
-
- private EncryptionA192GCM algorithm = new EncryptionA192GCM();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.BlockEncryption, algorithm.getType());
- Assert.assertEquals("AES/GCM/NoPadding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(192), algorithm.getKeyLength());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_GCM, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstants.CIPHER_PADDING_NONE, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256CBC_HS512Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256CBC_HS512Test.java
deleted file mode 100644
index 514fad80..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256CBC_HS512Test.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link EncryptionA256CBC_HS512}
- */
-public class EncryptionA256CBC_HS512Test {
-
- private EncryptionA256CBC_HS512 algorithm = new EncryptionA256CBC_HS512();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.BlockEncryption, algorithm.getType());
- Assert.assertEquals("AES/CBC/PKCS5Padding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(256), algorithm.getKeyLength());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_CBC, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstantExtension.CIPHER_PADDING_PKCS5, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256GCMTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256GCMTest.java
deleted file mode 100644
index c7d2122f..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/EncryptionA256GCMTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link EncryptionA256GCM}
- */
-public class EncryptionA256GCMTest {
-
- private EncryptionA256GCM algorithm = new EncryptionA256GCM();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.BlockEncryption, algorithm.getType());
- Assert.assertEquals("AES/GCM/NoPadding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(256), algorithm.getKeyLength());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_GCM, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstants.CIPHER_PADDING_NONE, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA1_5Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA1_5Test.java
deleted file mode 100644
index ececf4d9..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA1_5Test.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link KeyTransportRSA1_5}
- */
-public class KeyTransportRSA1_5Test {
-
- private KeyTransportRSA1_5 algorithm = new KeyTransportRSA1_5();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_RSA, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_RSA_1_5, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.KeyTransport, algorithm.getType());
- Assert.assertEquals("RSA/ECB/PKCS1Padding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_ECB, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstants.CIPHER_PADDING_PKCS1, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEPTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEPTest.java
deleted file mode 100644
index 43b28103..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEPTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link KeyTransportRSA_OAEP}
- */
-public class KeyTransportRSA_OAEPTest {
-
- private KeyTransportRSA_OAEP algorithm = new KeyTransportRSA_OAEP();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_RSA, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.KeyTransport, algorithm.getType());
- Assert.assertEquals("RSA/ECB/OAEPWithSHA-1AndMGF1Padding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_ECB, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstantExtension.CIPHER_PADDING_OAEP, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP_256Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP_256Test.java
deleted file mode 100644
index ef55e9d4..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/KeyTransportRSA_OAEP_256Test.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.geant.idpextension.oidc.crypto.support.JCAConstantExtension;
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link KeyTransportRSA_OAEP_256}
- */
-public class KeyTransportRSA_OAEP_256Test {
-
- private KeyTransportRSA_OAEP_256 algorithm = new KeyTransportRSA_OAEP_256();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_RSA, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.KeyTransport, algorithm.getType());
- Assert.assertEquals("RSA/ECB/OAEPWithSHA-256AndMGF1Padding", algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.CIPHER_MODE_ECB, algorithm.getCipherMode());
- Assert.assertEquals(JCAConstantExtension.CIPHER_PADDING_OAEP_256, algorithm.getPadding());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES256Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES256Test.java
deleted file mode 100644
index bc021b30..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES256Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureES256}
- */
-public class SignatureES256Test {
-
- private SignatureES256 algorithm = new SignatureES256();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_EC, algorithm.getKey());
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_ES_256, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Signature, algorithm.getType());
- Assert.assertEquals(JCAConstants.SIGNATURE_ECDSA_SHA256, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA256, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES384Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES384Test.java
deleted file mode 100644
index 4e469ee9..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES384Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureES384}
- */
-public class SignatureES384Test {
-
- private SignatureES384 algorithm = new SignatureES384();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_EC, algorithm.getKey());
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_ES_384, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Signature, algorithm.getType());
- Assert.assertEquals(JCAConstants.SIGNATURE_ECDSA_SHA384, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA384, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES512Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES512Test.java
deleted file mode 100644
index 6fb6422c..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureES512Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureES512}
- */
-public class SignatureES512Test {
-
- private SignatureES512 algorithm = new SignatureES512();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_EC, algorithm.getKey());
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_ES_512, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Signature, algorithm.getType());
- Assert.assertEquals(JCAConstants.SIGNATURE_ECDSA_SHA512, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA512, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS256Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS256Test.java
deleted file mode 100644
index a46f733b..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS256Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureHS256}
- */
-public class SignatureHS256Test {
-
- private SignatureHS256 algorithm = new SignatureHS256();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_HS_256, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Mac, algorithm.getType());
- Assert.assertEquals(JCAConstants.HMAC_SHA256, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA256, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS384Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS384Test.java
deleted file mode 100644
index b2d3976a..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS384Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureHS384}
- */
-public class SignatureHS384Test {
-
- private SignatureHS384 algorithm = new SignatureHS384();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_HS_384, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Mac, algorithm.getType());
- Assert.assertEquals(JCAConstants.HMAC_SHA384, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA384, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS512Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS512Test.java
deleted file mode 100644
index 1343752d..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureHS512Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureHS512}
- */
-public class SignatureHS512Test {
-
- private SignatureHS512 algorithm = new SignatureHS512();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_HS_512, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Mac, algorithm.getType());
- Assert.assertEquals(JCAConstants.HMAC_SHA512, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA512, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS256Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS256Test.java
deleted file mode 100644
index 19d36797..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS256Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureRS256}
- */
-public class SignatureRS256Test {
-
- private SignatureRS256 algorithm = new SignatureRS256();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_RSA, algorithm.getKey());
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_RS_256, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Signature, algorithm.getType());
- Assert.assertEquals(JCAConstants.SIGNATURE_RSA_SHA256, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA256, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS384Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS384Test.java
deleted file mode 100644
index d496cb78..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS384Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureRS384}
- */
-public class SignatureRS384Test {
-
- private SignatureRS384 algorithm = new SignatureRS384();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_RSA, algorithm.getKey());
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_RS_384, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Signature, algorithm.getType());
- Assert.assertEquals(JCAConstants.SIGNATURE_RSA_SHA384, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA384, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS512Test.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS512Test.java
deleted file mode 100644
index 9ede53a8..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SignatureRS512Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SignatureRS512}
- */
-public class SignatureRS512Test {
-
- private SignatureRS512 algorithm = new SignatureRS512();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_RSA, algorithm.getKey());
- Assert.assertEquals(SignatureConstants.ALGO_ID_SIGNATURE_RS_512, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.Signature, algorithm.getType());
- Assert.assertEquals(JCAConstants.SIGNATURE_RSA_SHA512, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(JCAConstants.DIGEST_SHA512, algorithm.getDigest());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128GCMKWTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128GCMKWTest.java
deleted file mode 100644
index 1f42da90..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128GCMKWTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SymmetricKeyWrapA128GCMKW}
- */
-public class SymmetricKeyWrapA128GCMKWTest {
-
- private SymmetricKeyWrapA128GCMKW algorithm = new SymmetricKeyWrapA128GCMKW();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.SymmetricKeyWrap, algorithm.getType());
- Assert.assertEquals(JCAConstants.KEYWRAP_ALGO_AES, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(128), algorithm.getKeyLength());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128KWTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128KWTest.java
deleted file mode 100644
index 6b6d61d5..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA128KWTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SymmetricKeyWrapA128KW}
- */
-public class SymmetricKeyWrapA128KWTest {
-
- private SymmetricKeyWrapA128KW algorithm = new SymmetricKeyWrapA128KW();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_AES_128_KW, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.SymmetricKeyWrap, algorithm.getType());
- Assert.assertEquals(JCAConstants.KEYWRAP_ALGO_AES, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(128), algorithm.getKeyLength());
-
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192GCMKWTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192GCMKWTest.java
deleted file mode 100644
index ef822032..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192GCMKWTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SymmetricKeyWrapA192GCMKW}
- */
-public class SymmetricKeyWrapA192GCMKWTest {
-
- private SymmetricKeyWrapA192GCMKW algorithm = new SymmetricKeyWrapA192GCMKW();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.SymmetricKeyWrap, algorithm.getType());
- Assert.assertEquals(JCAConstants.KEYWRAP_ALGO_AES, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(192), algorithm.getKeyLength());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192KWTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192KWTest.java
deleted file mode 100644
index 08e07179..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA192KWTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SymmetricKeyWrapA192KW}
- */
-public class SymmetricKeyWrapA192KWTest {
-
- private SymmetricKeyWrapA192KW algorithm = new SymmetricKeyWrapA192KW();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_AES_192_KW, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.SymmetricKeyWrap, algorithm.getType());
- Assert.assertEquals(JCAConstants.KEYWRAP_ALGO_AES, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(192), algorithm.getKeyLength());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256GCMKWTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256GCMKWTest.java
deleted file mode 100644
index b0edea7b..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256GCMKWTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SymmetricKeyWrapA256GCMKW}
- */
-public class SymmetricKeyWrapA256GCMKWTest {
-
- private SymmetricKeyWrapA256GCMKW algorithm = new SymmetricKeyWrapA256GCMKW();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.SymmetricKeyWrap, algorithm.getType());
- Assert.assertEquals(JCAConstants.KEYWRAP_ALGO_AES, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(256), algorithm.getKeyLength());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256KWTest.java b/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256KWTest.java
deleted file mode 100644
index ec583872..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/idpextension/oidc/algorithm/descriptors/SymmetricKeyWrapA256KWTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.algorithm.descriptors;
-
-import org.testng.Assert;
-
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.opensaml.security.crypto.JCAConstants;
-import org.opensaml.xmlsec.algorithm.AlgorithmDescriptor.AlgorithmType;
-import org.testng.annotations.Test;
-
-/**
- * Unit tests for {@link SymmetricKeyWrapA256KW}
- */
-public class SymmetricKeyWrapA256KWTest {
-
- private SymmetricKeyWrapA256KW algorithm = new SymmetricKeyWrapA256KW();
-
- @Test
- public void testInitialState() {
- Assert.assertEquals(JCAConstants.KEY_ALGO_AES, algorithm.getKey());
- Assert.assertEquals(KeyManagementConstants.ALGO_ID_ALG_AES_256_KW, algorithm.getURI());
- Assert.assertEquals(AlgorithmType.SymmetricKeyWrap, algorithm.getType());
- Assert.assertEquals(JCAConstants.KEYWRAP_ALGO_AES, algorithm.getJCAAlgorithmID());
- Assert.assertEquals(Integer.valueOf(256), algorithm.getKeyLength());
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-api/src/test/java/org/geant/security/jwk/BasicJWKCredentialTest.java b/idp-oidc-extension-api/src/test/java/org/geant/security/jwk/BasicJWKCredentialTest.java
deleted file mode 100644
index b6bbb40e..00000000
--- a/idp-oidc-extension-api/src/test/java/org/geant/security/jwk/BasicJWKCredentialTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.security.jwk;
-
-import org.testng.Assert;
-
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import com.nimbusds.jose.Algorithm;
-
-public class BasicJWKCredentialTest {
-
- private BasicJWKCredential jwk;
- private Algorithm algo;
-
- @BeforeMethod
- protected void setUp() throws Exception {
- jwk = new BasicJWKCredential();
- algo = new Algorithm("RS256");
- }
-
- @Test
- public void testInitialState() {
- Assert.assertNull(jwk.getKid());
- Assert.assertNull(jwk.getAlgorithm());
- }
-
- @Test
- public void testSetters() {
- jwk.setKid("kid");
- jwk.setAlgorithm(algo);
- Assert.assertEquals(jwk.getKid(), "kid");
- Assert.assertEquals(jwk.getAlgorithm(), new Algorithm("RS256"));
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-distribution/src/main/resources/conf/oidc-relying-party.xml b/idp-oidc-extension-distribution/src/main/resources/conf/oidc-relying-party.xml
index 8fceefd7..3d8de1e3 100644
--- a/idp-oidc-extension-distribution/src/main/resources/conf/oidc-relying-party.xml
+++ b/idp-oidc-extension-distribution/src/main/resources/conf/oidc-relying-party.xml
@@ -79,29 +79,29 @@
<property name="signatureAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
<!--
Not supported by the default P-256 EC key. P-384 and P-512 need to be added as credential if activated.
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
-->
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
</list>
</property>
</bean>
@@ -111,39 +111,39 @@
<property name="keyTransportEncryptionAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
</list>
</property>
<property name="dataEncryptionAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
</list>
</property>
</bean>
@@ -154,39 +154,39 @@
<property name="keyTransportEncryptionAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
</list>
</property>
<property name="dataEncryptionAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
</list>
</property>
</bean>
@@ -196,23 +196,23 @@
<property name="signatureAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
</list>
</property>
</bean>
@@ -222,23 +222,23 @@
<property name="signatureAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
</list>
</property>
</bean>
diff --git a/idp-oidc-extension-impl/pom.xml b/idp-oidc-extension-impl/pom.xml
index f1c6f10f..6ea51039 100644
--- a/idp-oidc-extension-impl/pom.xml
+++ b/idp-oidc-extension-impl/pom.xml
@@ -61,6 +61,14 @@
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-saml-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-impl</artifactId>
+ </dependency>
<dependency>
<groupId>net.shibboleth.oidc</groupId>
<artifactId>oidc-common-saml-impl</artifactId>
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretProvider.java
index 4815212e..4a06a44d 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretProvider.java
@@ -21,8 +21,6 @@ import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.security.jwk.BasicNimbusSecretCredential;
-import org.geant.security.jwk.NimbusSecretCredential;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
@@ -34,6 +32,8 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.oauth2.sdk.auth.Secret;
import net.shibboleth.oidc.saml.xmlobject.ClientSecret;
+import net.shibboleth.oidc.security.credential.BasicNimbusSecretCredential;
+import net.shibboleth.oidc.security.credential.NimbusSecretCredential;
import net.shibboleth.utilities.java.support.collection.LazySet;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
index bfb8ad14..bff21ff1 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
@@ -24,8 +24,6 @@ import javax.annotation.Nullable;
import org.geant.idpextension.oidc.criterion.ClientSecretReferenceCriterion;
import org.geant.idpextension.oidc.metadata.resolver.ClientSecretValueResolver;
-import org.geant.security.jwk.BasicNimbusSecretCredential;
-import org.geant.security.jwk.NimbusSecretCredential;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
@@ -37,6 +35,8 @@ import org.slf4j.LoggerFactory;
import com.nimbusds.oauth2.sdk.auth.Secret;
import net.shibboleth.oidc.saml.xmlobject.ClientSecretKeyReference;
+import net.shibboleth.oidc.security.credential.BasicNimbusSecretCredential;
+import net.shibboleth.oidc.security.credential.NimbusSecretCredential;
import net.shibboleth.utilities.java.support.collection.LazySet;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/InlineJwksProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/InlineJwksProvider.java
index e6bd9034..19970220 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/InlineJwksProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/InlineJwksProvider.java
@@ -24,9 +24,6 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.idpextension.oidc.security.impl.CredentialConversionUtil;
-import org.geant.security.jwk.BasicJWKCredential;
-import org.geant.security.jwk.JWKCredential;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.Credential;
@@ -44,6 +41,9 @@ import com.nimbusds.jose.jwk.JWKSet;
import com.nimbusds.jose.jwk.KeyType;
import net.shibboleth.oidc.saml.xmlobject.JwksData;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
+import net.shibboleth.oidc.security.credential.JWKCredential;
+import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
import net.shibboleth.utilities.java.support.codec.Base64Support;
import net.shibboleth.utilities.java.support.codec.DecodingException;
import net.shibboleth.utilities.java.support.collection.LazySet;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/JWKSReferenceProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/JWKSReferenceProvider.java
index 98eb9f52..411348a4 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/JWKSReferenceProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/JWKSReferenceProvider.java
@@ -23,8 +23,6 @@ import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.security.jwk.BasicJWKReferenceCredential;
-import org.geant.security.jwk.JWKReferenceCredential;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.security.SecurityException;
import org.opensaml.security.credential.Credential;
@@ -35,6 +33,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.oidc.saml.xmlobject.JwksUri;
+import net.shibboleth.oidc.security.credential.BasicJWKReferenceCredential;
+import net.shibboleth.oidc.security.credential.JWKReferenceCredential;
import net.shibboleth.utilities.java.support.collection.LazySet;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
index 577206d2..c3d3f9e5 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
@@ -29,8 +29,6 @@ import javax.annotation.Nullable;
import javax.xml.namespace.QName;
import org.geant.idpextension.oidc.config.OIDCCoreProtocolConfiguration;
-import org.geant.idpextension.oidc.security.impl.CredentialConversionUtil;
-import org.geant.security.jwk.NimbusSecretCredential;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.saml.criterion.RoleDescriptorCriterion;
import org.opensaml.saml.metadata.resolver.RoleDescriptorResolver;
@@ -72,6 +70,8 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.shibboleth.oidc.saml.xmlobject.DefaultAcrValue;
import net.shibboleth.oidc.saml.xmlobject.MetadataValueSAMLObject;
import net.shibboleth.oidc.saml.xmlobject.OAuthRPExtensions;
+import net.shibboleth.oidc.security.credential.NimbusSecretCredential;
+import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolver.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolver.java
index bc476314..179f04f2 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolver.java
@@ -27,7 +27,6 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import org.geant.idpextension.oidc.metadata.resolver.MetadataValueResolver;
-import org.geant.security.jwk.JWKCredential;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.security.credential.Credential;
@@ -43,6 +42,7 @@ import com.nimbusds.jose.jwk.RSAKey;
import net.minidev.json.JSONArray;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.oidc.security.credential.JWKCredential;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractSignJWTAction.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractSignJWTAction.java
index e45ee93d..698eaeee 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractSignJWTAction.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AbstractSignJWTAction.java
@@ -20,8 +20,6 @@ import java.security.interfaces.ECPrivateKey;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.geant.idpextension.oidc.security.impl.CredentialConversionUtil;
-import org.geant.security.jwk.JWKCredential;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -39,6 +37,9 @@ import com.nimbusds.jose.crypto.RSASSASigner;
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.SignedJWT;
+import net.shibboleth.oidc.security.credential.JWKCredential;
+import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
+
/**
* Abstract action for signing JWT. The extending class is expected to set claims set by implementing
* {@link #getClaimsSetToSign}. The signed jwt is received by extending class by implementing method
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadata.java
index 2fa91e72..94ab202a 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadata.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadata.java
@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
import org.geant.idpextension.oidc.config.navigate.DataEncryptionAlgorithmsLookupFunction;
import org.geant.idpextension.oidc.config.navigate.KeyTransportEncryptionAlgorithmsLookupFunction;
import org.geant.idpextension.oidc.config.navigate.SignatureAlgorithmsLookupFunction;
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -36,6 +35,7 @@ import com.nimbusds.jose.EncryptionMethod;
import com.nimbusds.jose.JWEAlgorithm;
import com.nimbusds.jose.JWSAlgorithm;
+import net.shibboleth.oidc.jwa.support.SignatureConstants;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadata.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadata.java
index efd2d2b0..91113f1f 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadata.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadata.java
@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
import org.geant.idpextension.oidc.config.navigate.DataEncryptionAlgorithmsLookupFunction;
import org.geant.idpextension.oidc.config.navigate.KeyTransportEncryptionAlgorithmsLookupFunction;
import org.geant.idpextension.oidc.config.navigate.SignatureAlgorithmsLookupFunction;
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -38,6 +37,7 @@ import com.nimbusds.jose.JWEAlgorithm;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.oauth2.sdk.ResponseType;
+import net.shibboleth.oidc.jwa.support.SignatureConstants;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedToken.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedToken.java
index 24da5b2b..c5971716 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedToken.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedToken.java
@@ -25,7 +25,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseContext;
-import org.geant.idpextension.oidc.security.impl.CredentialConversionUtil;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
@@ -48,6 +47,7 @@ import com.nimbusds.jose.crypto.RSAEncrypter;
import com.nimbusds.jwt.EncryptedJWT;
import com.nimbusds.jwt.SignedJWT;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessage.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessage.java
index fd03d510..3daf72bd 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessage.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/FormOutboundKeySetResponseMessage.java
@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
import org.geant.idpextension.oidc.messaging.JSONSuccessResponse;
import org.geant.idpextension.oidc.profile.api.OIDCSecurityConfiguration;
-import org.geant.idpextension.oidc.security.impl.CredentialConversionUtil;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
@@ -43,6 +42,7 @@ import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignRegistrationResponse.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignRegistrationResponse.java
index a55377d2..47976784 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignRegistrationResponse.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/impl/SignRegistrationResponse.java
@@ -28,8 +28,6 @@ import javax.annotation.Nullable;
import org.geant.idpextension.oidc.messaging.context.navigate.OIDCClientRegistrationResponseMetadataLookupFunction;
import org.geant.idpextension.oidc.profile.context.navigate.MetadataStatementsLookupFunction;
-import org.geant.idpextension.oidc.security.impl.CredentialConversionUtil;
-import org.geant.security.jwk.JWKCredential;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
@@ -55,6 +53,8 @@ import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.minidev.json.JSONObject;
import net.shibboleth.idp.profile.AbstractProfileAction;
+import net.shibboleth.oidc.security.credential.JWKCredential;
+import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/factory/BasicJWKCredentialFactoryBean.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/factory/BasicJWKCredentialFactoryBean.java
index 184910c8..e09987e3 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/factory/BasicJWKCredentialFactoryBean.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/factory/BasicJWKCredentialFactoryBean.java
@@ -27,9 +27,9 @@ import org.springframework.core.io.Resource;
import java.text.ParseException;
import java.util.List;
import net.shibboleth.idp.profile.spring.factory.AbstractCredentialFactoryBean;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
+import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
-import org.geant.idpextension.oidc.security.impl.CredentialConversionUtil;
-import org.geant.security.jwk.BasicJWKCredential;
import com.nimbusds.jose.jwk.JWK;
import com.nimbusds.jose.jwk.AsymmetricJWK;
import com.nimbusds.jose.jwk.OctetSequenceKey;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/CredentialConversionUtil.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/CredentialConversionUtil.java
deleted file mode 100644
index ed7e7892..00000000
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/CredentialConversionUtil.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.geant.idpextension.oidc.security.impl;
-
-import java.security.interfaces.ECPublicKey;
-import java.security.interfaces.RSAPublicKey;
-
-import javax.annotation.Nonnull;
-
-import org.geant.security.jwk.JWKCredential;
-import org.opensaml.security.credential.Credential;
-import org.opensaml.security.credential.UsageType;
-
-import com.nimbusds.jose.jwk.Curve;
-import com.nimbusds.jose.jwk.ECKey;
-import com.nimbusds.jose.jwk.JWK;
-import com.nimbusds.jose.jwk.KeyUse;
-import com.nimbusds.jose.jwk.RSAKey;
-
-/**
- * Generic tool methods related to converting {@link Credential} to JWK.
- */
-public final class CredentialConversionUtil {
-
- /** Private constructor. */
- private CredentialConversionUtil() {
-
- }
-
- /**
- * Resolves kid from key name. If there is no key name and the credential is JWK, the kid is read from JWK.
- *
- * @param credential input key names
- *
- * @return key names or null if not found
- */
- public static String resolveKid(@Nonnull final Credential credential) {
- if (credential.getKeyNames() != null) {
- for (final String keyName : credential.getKeyNames()) {
- return keyName;
- }
- }
- if (credential instanceof JWKCredential) {
- return ((JWKCredential) credential).getKid();
- }
- return null;
- }
-
- /**
- * Resolves KeyUse parameter from credential.
- *
- * @param credential credential to resolve KeyUse of
- * @return KeyUse of credential
- */
- public static KeyUse resolveKeyUse(final Credential credential) {
- if (credential == null || credential.getUsageType() == null) {
- return null;
- }
- if (credential.getUsageType().equals(UsageType.SIGNING)) {
- return KeyUse.SIGNATURE;
- }
- if (credential.getUsageType().equals(UsageType.ENCRYPTION)) {
- return KeyUse.ENCRYPTION;
- }
- return null;
- }
-
- /**
- * Converts credential to JWK. Only RSA and EC keys supported.
- *
- * @param credential to convert.
- * @return credential as JWK.
- */
- public static JWK credentialToKey(final Credential credential) {
- if (credential == null || credential.getPublicKey() == null) {
- return null;
- }
- final String algorithm = credential.getPublicKey().getAlgorithm();
- if ("RSA".equals(algorithm)) {
- return new RSAKey.Builder((RSAPublicKey) credential.getPublicKey()).keyUse(resolveKeyUse(credential))
- .keyID(resolveKid(credential)).build();
- }
- if ("EC".equals(algorithm)) {
- return new ECKey.Builder(Curve.forECParameterSpec(((ECPublicKey) credential.getPublicKey()).getParams()),
- (ECPublicKey) credential.getPublicKey()).keyUse(resolveKeyUse(credential))
- .keyID(resolveKid(credential)).build();
- }
- return null;
- }
-
-
- /**
- * Converts JWK key usage type to OpenSAML usage type.
- *
- * @param jwk containing usage type. Must not be null.
- * @return usage type.
- */
- public static UsageType getUsageType(@Nonnull final JWK jwk) {
- if (KeyUse.ENCRYPTION.equals(jwk.getKeyUse())) {
- return UsageType.ENCRYPTION;
- }
- if (KeyUse.SIGNATURE.equals(jwk.getKeyUse())) {
- return UsageType.SIGNING;
- }
- return UsageType.UNSPECIFIED;
- }
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/JWTSignatureValidationUtil.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/JWTSignatureValidationUtil.java
index 3214dc37..1a57acfe 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/JWTSignatureValidationUtil.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/JWTSignatureValidationUtil.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import javax.annotation.Nonnull;
-import org.geant.security.jwk.JWKCredential;
import org.opensaml.profile.action.EventIds;
import org.opensaml.xmlsec.context.SecurityParametersContext;
import org.slf4j.Logger;
@@ -37,6 +36,8 @@ import com.nimbusds.jose.crypto.MACVerifier;
import com.nimbusds.jose.crypto.RSASSAVerifier;
import com.nimbusds.jwt.SignedJWT;
+import net.shibboleth.oidc.security.credential.JWKCredential;
+
/**
* Generic utility class for helping JWT signature validation.
*/
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java
index e67ee5a0..758c780f 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationEncryptionParametersResolver.java
@@ -28,12 +28,12 @@ import javax.annotation.Nullable;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.geant.idpextension.oidc.criterion.ClientInformationCriterion;
-import org.geant.security.jwk.BasicJWKCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.EncryptionConfiguration;
import org.opensaml.xmlsec.EncryptionParameters;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
index c0326c61..61ecfd7b 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureSigningParametersResolver.java
@@ -25,12 +25,12 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.crypto.spec.SecretKeySpec;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.geant.idpextension.oidc.criterion.ClientInformationCriterion;
-import org.geant.security.jwk.BasicJWKCredential;
import org.opensaml.security.credential.Credential;
import org.opensaml.xmlsec.SignatureSigningParameters;
import org.opensaml.xmlsec.criterion.SignatureSigningConfigurationCriterion;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
index b20e4a01..ad3e5569 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCClientInformationSignatureValidationParametersResolver.java
@@ -25,12 +25,12 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.crypto.spec.SecretKeySpec;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
import org.geant.idpextension.oidc.criterion.ClientInformationCriterion;
-import org.geant.security.jwk.BasicJWKCredential;
import org.opensaml.xmlsec.SignatureSigningParameters;
import org.opensaml.xmlsec.criterion.SignatureSigningConfigurationCriterion;
import org.opensaml.xmlsec.impl.BasicSignatureSigningParametersResolver;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCSignatureValidationParameters.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCSignatureValidationParameters.java
index debdb3e4..7328e85d 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCSignatureValidationParameters.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/security/impl/OIDCSignatureValidationParameters.java
@@ -21,9 +21,10 @@ import java.util.List;
import javax.annotation.Nonnull;
-import org.geant.security.jwk.JWKCredential;
import org.opensaml.xmlsec.SignatureSigningParameters;
+import net.shibboleth.oidc.security.credential.JWKCredential;
+
/**
* OIDC Signature Validation Parameters. Steals a bit SignatureSigningParameters as extending it also for validation
* purposes.
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
index 48250891..f5a36cd4 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddRequestObjectSecurityConfigurationToClientMetadataTest.java
@@ -19,9 +19,6 @@ package org.geant.idpextension.oidc.profile.impl;
import java.util.Arrays;
import java.util.List;
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
import org.opensaml.profile.action.EventIds;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
@@ -33,6 +30,9 @@ import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.oidc.jwa.support.EncryptionConstants;
+import net.shibboleth.oidc.jwa.support.KeyManagementConstants;
+import net.shibboleth.oidc.jwa.support.SignatureConstants;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
index f536403b..b7660b2b 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/AddSecurityConfigurationToClientMetadataTest.java
@@ -19,9 +19,6 @@ package org.geant.idpextension.oidc.profile.impl;
import java.util.Collections;
import java.util.List;
-import org.geant.idpextension.oidc.crypto.support.EncryptionConstants;
-import org.geant.idpextension.oidc.crypto.support.KeyManagementConstants;
-import org.geant.idpextension.oidc.crypto.support.SignatureConstants;
import org.mockito.Mockito;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -40,6 +37,9 @@ import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
+import net.shibboleth.oidc.jwa.support.EncryptionConstants;
+import net.shibboleth.oidc.jwa.support.KeyManagementConstants;
+import net.shibboleth.oidc.jwa.support.SignatureConstants;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java
index 3462b389..e5c5993b 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/DecryptRequestObjectTest.java
@@ -20,6 +20,7 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -33,7 +34,6 @@ import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseC
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.geant.idpextension.oidc.profile.OidcEventIds;
import org.geant.idpextension.oidc.security.impl.OIDCDecryptionParameters;
-import org.geant.security.jwk.BasicJWKCredential;
import org.opensaml.messaging.context.BaseContext;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java
index deb42533..e11ac422 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/EncryptProcessedTokenTest.java
@@ -21,6 +21,7 @@ import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
@@ -33,7 +34,6 @@ import java.text.ParseException;
import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseContext;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
-import org.geant.security.jwk.BasicJWKCredential;
import org.opensaml.messaging.context.BaseContext;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.profile.action.EventIds;
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java
index 89b6657f..a311b75a 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateEndpointAuthenticationTest.java
@@ -32,7 +32,6 @@ import javax.crypto.spec.SecretKeySpec;
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.geant.idpextension.oidc.security.impl.OIDCSignatureValidationParameters;
-import org.geant.security.jwk.BasicJWKCredential;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.storage.ReplayCache;
@@ -68,6 +67,7 @@ import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFun
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java
index 96c7554e..289a5ee4 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/profile/impl/ValidateRequestObjectTest.java
@@ -19,6 +19,7 @@ package org.geant.idpextension.oidc.profile.impl;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
+import net.shibboleth.oidc.security.credential.BasicJWKCredential;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -31,7 +32,6 @@ import org.geant.idpextension.oidc.messaging.context.OIDCAuthenticationResponseC
import org.geant.idpextension.oidc.messaging.context.OIDCMetadataContext;
import org.geant.idpextension.oidc.profile.OidcEventIds;
import org.geant.idpextension.oidc.security.impl.OIDCSignatureValidationParameters;
-import org.geant.security.jwk.BasicJWKCredential;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.xmlsec.context.SecurityParametersContext;
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/oidc-relying-party.xml b/idp-oidc-extension-impl/src/test/resources/conf/oidc-relying-party.xml
index 639e315a..d7afb00c 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/oidc-relying-party.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/oidc-relying-party.xml
@@ -79,29 +79,29 @@
<property name="signatureAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
<!--
Not supported by the default P-256 EC key. P-384 and P-512 need to be added as credential if activated.
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
-->
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
</list>
</property>
</bean>
@@ -111,39 +111,39 @@
<property name="keyTransportEncryptionAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
</list>
</property>
<property name="dataEncryptionAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
</list>
</property>
</bean>
@@ -154,39 +154,39 @@
<property name="keyTransportEncryptionAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
+ static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
</list>
</property>
<property name="dataEncryptionAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
+ static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
</list>
</property>
</bean>
@@ -196,23 +196,23 @@
<property name="signatureAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
</list>
</property>
</bean>
@@ -222,23 +222,23 @@
<property name="signatureAlgorithms">
<list>
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_ES_512" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
<util:constant
- static-field="org.geant.idpextension.oidc.crypto.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
+ static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
</list>
</property>
</bean>
diff --git a/pom.xml b/pom.xml
index 401dfdd2..13fc9812 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,16 @@
<artifactId>oidc-common-saml-api</artifactId>
<version>${oidc-common.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-api</artifactId>
+ <version>${oidc-common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth.oidc</groupId>
+ <artifactId>oidc-common-crypto-impl</artifactId>
+ <version>${oidc-common.version}</version>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list