summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/talli.funet.fi.xml
diff options
context:
space:
mode:
Diffstat (limited to 'swamid-interfederations-2.0/talli.funet.fi.xml')
-rw-r--r--swamid-interfederations-2.0/talli.funet.fi.xml19
1 files changed, 9 insertions, 10 deletions
diff --git a/swamid-interfederations-2.0/talli.funet.fi.xml b/swamid-interfederations-2.0/talli.funet.fi.xml
index eee8a90f..05224f7d 100644
--- a/swamid-interfederations-2.0/talli.funet.fi.xml
+++ b/swamid-interfederations-2.0/talli.funet.fi.xml
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://talli.funet.fi/haka">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://talli.funet.fi/haka">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://talli.funet.fi/Shibboleth.sso/DS" index="1"/>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
<mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
<mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
<mdui:Keywords xml:lang="fi">testi attribuutit</mdui:Keywords>
@@ -44,10 +45,8 @@ eEAH1RvfTsj/y527aKeZCRXGK8M8QBOJaA1VAE84H7qCBfB61q1jLPZJQqi/PpQt
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://talli.funet.fi/haka/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://talli.funet.fi/haka/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
<md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
@@ -137,13 +136,13 @@ eEAH1RvfTsj/y527aKeZCRXGK8M8QBOJaA1VAE84H7qCBfB61q1jLPZJQqi/PpQt
<md:EmailAddress>haka@csc.fi</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
- <md:GivenName>Kari</md:GivenName>
- <md:SurName>Laalo</md:SurName>
- <md:EmailAddress>kari.laalo@csc.fi</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
<md:GivenName>Janne</md:GivenName>
<md:SurName>Lauros</md:SurName>
<md:EmailAddress>haka@csc.fi</md:EmailAddress>
</md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Kari</md:GivenName>
+ <md:SurName>Laalo</md:SurName>
+ <md:EmailAddress>kari.laalo@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>