summaryrefslogtreecommitdiff
path: root/swamid-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'swamid-2.0')
-rw-r--r--swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml15
-rw-r--r--swamid-2.0/swamid.vr.se-idp-shibboleth.xml15
2 files changed, 15 insertions, 15 deletions
diff --git a/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml b/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
index 061489d3..162e7d65 100644
--- a/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
+++ b/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
@@ -1,11 +1,18 @@
<?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://livesrv.ex.vr.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>
+ </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">
<Extensions>
<shibmd:Scope regexp="false">vr.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Vetenskapsrådet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Vetenskapsrådet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Vetenskapsrådet gammal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Vetenskapsrådet old</mdui:DisplayName>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor>
@@ -82,8 +89,8 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">VR</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Vetenskapsrådet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet gammal</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Vetenskapsrådet old</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
index ab7b32c3..ec5f2d97 100644
--- a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
@@ -1,19 +1,12 @@
<?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://swamid.vr.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>
- </saml:Attribute>
- </attr:EntityAttributes>
- </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmd:Scope regexp="false">vr.se</shibmd:Scope>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Vetenskapsrådet PRODTEST</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Vetenskapsrådet</mdui:DisplayName>
<mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
- <mdui:DisplayName xml:lang="en">The Swedish Research Council PRODTEST</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">The Swedish Research Council</mdui:DisplayName>
<mdui:Description xml:lang="en">IDP at Swedish Research Council</mdui:Description>
<mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
@@ -192,8 +185,8 @@ ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">VR</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet PRODTEST</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">The Swedish Research Council PRODTEST</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">The Swedish Research Council</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">