aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2017-12-11 11:34:54 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2017-12-11 11:34:54 +0100
commit258bdb751beb4c2f82306e67f067d1bb9df2743a (patch)
tree6361089b8813665708a889bd1304ab63f248e6a9 /id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa
parentcaa1690996b62c0ffa7fa99162e583fcf98bd26c (diff)
parentf18f6318f7233b336ea2653f183460f17d6562f0 (diff)
downloadmoa-id-spss-258bdb751beb4c2f82306e67f067d1bb9df2743a.tar.gz
moa-id-spss-258bdb751beb4c2f82306e67f067d1bb9df2743a.tar.bz2
moa-id-spss-258bdb751beb4c2f82306e67f067d1bb9df2743a.zip
Merge branch 'development_preview' into eIDAS_node_implementation
# Conflicts: # id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/metadata/MOAMetadataProvider.java # id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/metadata/PVPEntityCategoryFilter.java
Diffstat (limited to 'id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa')
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java
index 07b07d980..4dda4c736 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/AuthConfiguration.java
@@ -13,6 +13,7 @@ public interface AuthConfiguration extends ConfigurationProvider{
public static final String PROP_KEY_SSL_HOSTNAME_VALIDATION = "configuration.ssl.validation.hostname";
public static final String PROP_KEY_OVS_SSL_HOSTNAME_VALIDATION = "service.onlinemandates.ssl.validation.hostname";
+ public static final String PROP_KEY_PROTOCOL_PVP_METADATA_ENTITYCATEGORY_RESOLVER = "protocols.pvp2.metadata.entitycategories.active";
public static final String DEFAULT_X509_CHAININGMODE = "pkix";