summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas <>2024-11-11 12:10:48 +0100
committerThomas <>2024-11-11 12:10:48 +0100
commit5787921644497db646f87d88279ab56d10e09b24 (patch)
tree97bfa69e3b88733391258de6f4ac150d068441ac
parent6f8cb7ec2adc4e91fa6a253ef937ba78d115ae00 (diff)
downloadEAAF-Components-5787921644497db646f87d88279ab56d10e09b24.tar.gz
EAAF-Components-5787921644497db646f87d88279ab56d10e09b24.tar.bz2
EAAF-Components-5787921644497db646f87d88279ab56d10e09b24.zip
chore(core): allow some more algorithms for SAML2 communication
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java15
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafOpenSaml3xInitializer.java4
2 files changed, 16 insertions, 3 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java
index 2f18f780..6a00125a 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java
@@ -130,6 +130,16 @@ public class EaafDefaultSecurityConfigurationBootstrap
SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA384,
SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA512,
+ // RSA-PSS
+ SignatureConstants.ALGO_ID_SIGNATURE_RSASSA_PSS_SHA256_MGF1,
+ SignatureConstants.ALGO_ID_SIGNATURE_RSASSA_PSS_SHA384_MGF1,
+ SignatureConstants.ALGO_ID_SIGNATURE_RSASSA_PSS_SHA512_MGF1,
+
+ // RSA-PSS
+ SignatureConstants.ALGO_ID_SIGNATURE_RSASSA_PSS_SHA3_256_MGF1,
+ SignatureConstants.ALGO_ID_SIGNATURE_RSASSA_PSS_SHA3_384_MGF1,
+ SignatureConstants.ALGO_ID_SIGNATURE_RSASSA_PSS_SHA3_512_MGF1,
+
// ECDSA
SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA256,
SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA384,
@@ -146,7 +156,10 @@ public class EaafDefaultSecurityConfigurationBootstrap
// The order of these is significant.
SignatureConstants.ALGO_ID_DIGEST_SHA256,
SignatureConstants.ALGO_ID_DIGEST_SHA384,
- SignatureConstants.ALGO_ID_DIGEST_SHA512));
+ SignatureConstants.ALGO_ID_DIGEST_SHA512,
+ SignatureConstants.ALGO_ID_DIGEST_SHA3_256,
+ SignatureConstants.ALGO_ID_DIGEST_SHA3_384,
+ SignatureConstants.ALGO_ID_DIGEST_SHA3_512));
config.setSignatureCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafOpenSaml3xInitializer.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafOpenSaml3xInitializer.java
index a92692f2..7dc2405b 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafOpenSaml3xInitializer.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafOpenSaml3xInitializer.java
@@ -70,13 +70,13 @@ public class EaafOpenSaml3xInitializer extends InitializationService {
log.debug("Initializing OpenSAML 4.x ... ");
initialize();
- log.debug("Injecting EAAF-specific configuration into OpenSAML 4.x ... ");
+ log.debug("Injecting EAAF-specific configuration into OpenSAML 5.x ... ");
injectEaafSecurityProperty();
injectEaafExtenstions();
XMLObjectProviderRegistrySupport.setParserPool(eaafSecuredBasicParserPool());
- log.info("OpenSAML 4.x with EAAF extensions initialized");
+ log.info("OpenSAML 5.x with EAAF extensions initialized");
}