Merge branch 'master' of md-master.swamid.se:swamid-metadata

1 files changed, 18 insertions, 9 deletions

diff --git a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
index 1d0d4424..c74736c2 100644
--- a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
@@ -1,15 +1,25 @@
 <?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: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.uef.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uef.fi/idp/shibboleth">
+  <md: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>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
-      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uef.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Eastern Finland</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
+        <mdui:Description xml:lang="en">University of Eastern Finland students, faculty and employees.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://www.uef.fi/fi/etusivu</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
 MQ8wDQYDVQQHDAZLdW9waW8xJjAkBgNVBAoMHVVuaXZlcnNpdHkgb2YgRWFzdGVy
@@ -33,7 +43,6 @@ WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</ds:X509Certifi
         </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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uef.fi/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>