http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 43 insertions, 42 deletions

diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
index 7b50bdbc..7275d47e 100644
--- a/swamid-interfederations-2.0/sso.utu.fi.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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://sso.utu.fi/sso-idp">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+<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" entityID="https://sso.utu.fi/sso-idp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
@@ -56,35 +57,35 @@ njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
 8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tuomas</md:GivenName>
-    <md:SurName>Honkala</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petri</md:GivenName>
-    <md:SurName>Teraspuro</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Elina</md:GivenName>
-    <md:SurName>Toivanen</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">Turun yliopisto</OrganizationName>
+    <OrganizationName xml:lang="en">University of Turku</OrganizationName>
+    <OrganizationName xml:lang="sv">Åbo universitet</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">Turun yliopisto</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Turku</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Åbo universitet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.utu.fi/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.utu.fi/</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.utu.fi/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Tuomas</GivenName>
+    <SurName>Honkala</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Petri</GivenName>
+    <SurName>Teraspuro</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Elina</GivenName>
+    <SurName>Toivanen</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>