diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-03-14 12:51:53 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-03-14 12:51:53 +0100 |
| commit | 6c9e452d5ab984c1ef221c4a2e746454aa41e014 (patch) | |
| tree | 9aa1913c678f2e53a3c14cdd3139fe92d0e445b7 | |
| parent | e9375ac9b0dbd5e9c5e19f0d2779dd94385b0040 (diff) | |
| download | moa-id-spss-6c9e452d5ab984c1ef221c4a2e746454aa41e014.tar.gz moa-id-spss-6c9e452d5ab984c1ef221c4a2e746454aa41e014.tar.bz2 moa-id-spss-6c9e452d5ab984c1ef221c4a2e746454aa41e014.zip | |
change PKIX chaining mode constant
3 files changed, 6 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java index 7ecd7dde8..9d105f151 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java @@ -446,7 +446,7 @@ public class BuildFromLegacyConfig { //set chaining modes ChainingModes moa_chainingModes = new ChainingModes(); moaIDConfig.setChainingModes(moa_chainingModes); - + ChainingModeType type = ChainingModeType.fromValue(builder.getDefaultChainingMode()); moa_chainingModes.setSystemDefaultMode(type); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/ConfigurationBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/ConfigurationBuilder.java index 6ad45d8c9..682b00702 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/ConfigurationBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/ConfigurationBuilder.java @@ -113,7 +113,7 @@ public class ConfigurationBuilder { // chaining mode constants appearing in the configuration file // /** an XPATH-Expression */ - protected static final String CM_CHAINING = "chaining"; + public static final String CM_CHAINING = "chaining"; /** an XPATH-Expression */ protected static final String CM_PKIX = "pkix"; /** an XPATH-Expression */ @@ -939,10 +939,13 @@ public List getTrustedTemplateURLs() { protected String translateChainingMode(String chainingMode) { if (chainingMode.equals(CM_CHAINING)) { return ChainingModes.CHAIN_MODE; + } else if (chainingMode.equals(CM_PKIX)) { return ChainingModes.PKIX_MODE; + } else { return ChainingModes.CHAIN_MODE; + } } diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd index e6705dbb8..269da4cd6 100644 --- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd +++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd @@ -569,7 +569,7 @@ <xsd:element name="TrustProfileID" type="xsd:string"/> <xsd:simpleType name="ChainingModeType"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="chaining"/> + <xsd:enumeration value="chain"/> <xsd:enumeration value="pkix"/> </xsd:restriction> </xsd:simpleType> |