diff options
| -rw-r--r-- | swamid-2.0/idp.rkh.se-idp-shibboleth.xml | 7 | ||||
| -rw-r--r-- | swamid-2.0/idp2.rkh.se-idp-shibboleth.xml | 6 | ||||
| -rw-r--r-- | swamid-edugain-idp-1.0.mxml | 2 | ||||
| -rw-r--r-- | swamid-idp-2.0.mxml | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml index 9cbf8ccd..75319cd1 100644 --- a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.rkh.se/idp/shibboleth"> <Extensions> - <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute"> - <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute"> + <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue> </saml:Attribute> + <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category"> + <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue> + </saml:Attribute> </attr:EntityAttributes> </Extensions> <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> diff --git a/swamid-2.0/idp2.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp2.rkh.se-idp-shibboleth.xml index ae973546..299c552b 100644 --- a/swamid-2.0/idp2.rkh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2.rkh.se-idp-shibboleth.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp2.rkh.se/idp/shibboleth"> <Extensions> - <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute"> - <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category"> - <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue> + <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute"> + <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue> </saml:Attribute> </attr:EntityAttributes> </Extensions> diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index b6919833..c36a9086 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -18,7 +18,6 @@ <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/miunidp.miun.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/identity.mdh.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kva.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/> @@ -50,4 +49,5 @@ <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp01.gih.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 35845634..df9212a9 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -14,7 +14,7 @@ <xi:include href="swamid-2.0/idp.mdh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/> - <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/> |