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

1 files changed, 43 insertions, 42 deletions

diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index daddee88..40e594e2 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0"?>
-<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://idp.csc.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
-      <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csc.fi/idp/shibboleth">
+    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
           <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
           <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
           <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
@@ -15,18 +20,14 @@
           <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
           <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         </mdui:UIInfo>
-      <mdui:DiscoHints>
+        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
           <mdui:DomainHint>csc.fi</mdui:DomainHint>
         </mdui:DiscoHints>
-      <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>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEvjCCA6agAwIBAgIRANzJo7X5SEmbvBstb88M+4kwDQYJKoZIhvcNAQEFBQAw
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>MIIEvjCCA6agAwIBAgIRANzJo7X5SEmbvBstb88M+4kwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMTEyMjEwMDAwMDBaFw0xMzEyMjAyMzU5NTlaMIGBMQswCQYD
 VQQGEwJGSTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UEBxMFRXNwb28xKTAnBgNV
@@ -52,29 +53,29 @@ YNFbjK64dwCnMNGfVw1zepuRBVE0BLklgn8wqQf6yKj1HzOB6UT4UUABt71zrdcS
 yv274zsJoe2SU6+POX6wH82lz5Vc9BkxLE8vBSGB78n4BFKSdEPRWIYkeq7Kwk8L
 MwFER9iEtf/HEH+CmxYoqZCr/mm7FduiAyOdQ+AZrQgvFP2c5sqxqhAwQyrW9eU/
 yDPlRNL+S5OBIx61TJQTJ1DZ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Lauros</md:SurName>
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+    </IDPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+      <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+      <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+      <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+      <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+      <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+      <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+      <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+      <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Janne</GivenName>
+      <SurName>Lauros</SurName>
+      <EmailAddress>haka@csc.fi</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="support">
+      <EmailAddress>haka@csc.fi</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>