obsolete Ladok3 sites removed, Ladok3 sites updated with contactperson and mdui

1 files changed, 36 insertions, 22 deletions

diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
index 4d633ec8..82229028 100644
--- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
@@ -6,16 +6,21 @@
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -24,8 +29,14 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.mit.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 MIT</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Ladok www.mit.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.mit.ladok.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.mit.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.mit.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -34,26 +45,12 @@
         <ds:KeyName>www.mit.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.mit.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANNcGylEJgt3MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHd3dy5taXQubGFkb2suc2UwHhcNMTMwNDExMDcwMDQ3WhcNMjMwNDA5MDcw
-MDQ3WjAbMRkwFwYDVQQDExB3d3cubWl0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAswDSRA8IdF5WRRtQ9BPH2bscDtgLSzXAhk3JdshV
-BQN2zlrewF0FAulDEm7Lv4Ci1n9/mT0ITxvybvB0KD6WrS1ac0sWk8gXenT2Qs9l
-dgOJjRpF2lH2E5nK063xFauLngf1EGFiPxN7Gaiq58dk8NWchcfW3mHuN4gQZi1k
-UH6hBXuuaIyDWyigyUzEUsTVDFhcLeIfylDSoM4wcL0QuBqFYBb4MyF6XLBCcQLe
-A+ugJMNmn/I4AzIdXF3WuopCYp3UWwhwKSwN57vdHMvi3E/9tXVVKZS8q4bdV3vF
-NgfvBrwWW3Aoq2KRB9jXH2fV3uUsXA4Hfre3ZetxO6cW6wIDAQABo18wXTA8BgNV
-HREENTAzghB3d3cubWl0LmxhZG9rLnNlhh9odHRwczovL3d3dy5taXQubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBQCB2VdO4d6ZY49UjaP0Wfm92LyJjANBgkqhkiG
-9w0BAQUFAAOCAQEAGO6QVRj8GjZNg0Z7wTVSQQVlTQhqp4OZIqNKgAFQNDd6sXc4
-Xe8AtIwcE6U7afG1R1uC80XE2HumOL84GqExtz23aLDKenFxe6w/QVRKXgDqYDjE
-VABSgE00pa3zSaDlBu6GpmcXsSjVyB5x641Si9oxZf6rhvqW1Lu/Lp+0FmX1DWmK
-NZfFVjy4HWD10ZYih94AG1VYNvy9nb17V+8s64tLdjhMZYoDHoONPtxNIEal5uvQ
-vkwILAtVdnYhq7OrK0V41hm5A5BLnyDf/nJAJVEAt+FAn4TDZzMvqtO4x1r1gvPh
-hiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANNcGylEJgt3MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEHd3dy5taXQubGFkb2suc2UwHhcNMTMwNDExMDcwMDQ3WhcNMjMwNDA5MDcwMDQ3WjAbMRkwFwYDVQQDExB3d3cubWl0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAswDSRA8IdF5WRRtQ9BPH2bscDtgLSzXAhk3JdshVBQN2zlrewF0FAulDEm7Lv4Ci1n9/mT0ITxvybvB0KD6WrS1ac0sWk8gXenT2Qs9ldgOJjRpF2lH2E5nK063xFauLngf1EGFiPxN7Gaiq58dk8NWchcfW3mHuN4gQZi1kUH6hBXuuaIyDWyigyUzEUsTVDFhcLeIfylDSoM4wcL0QuBqFYBb4MyF6XLBCcQLeA+ugJMNmn/I4AzIdXF3WuopCYp3UWwhwKSwN57vdHMvi3E/9tXVVKZS8q4bdV3vFNgfvBrwWW3Aoq2KRB9jXH2fV3uUsXA4Hfre3ZetxO6cW6wIDAQABo18wXTA8BgNVHREENTAzghB3d3cubWl0LmxhZG9rLnNlhh9odHRwczovL3d3dy5taXQubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBQCB2VdO4d6ZY49UjaP0Wfm92LyJjANBgkqhkiG9w0BAQUFAAOCAQEAGO6QVRj8GjZNg0Z7wTVSQQVlTQhqp4OZIqNKgAFQNDd6sXc4Xe8AtIwcE6U7afG1R1uC80XE2HumOL84GqExtz23aLDKenFxe6w/QVRKXgDqYDjEVABSgE00pa3zSaDlBu6GpmcXsSjVyB5x641Si9oxZf6rhvqW1Lu/Lp+0FmX1DWmKNZfFVjy4HWD10ZYih94AG1VYNvy9nb17V+8s64tLdjhMZYoDHoONPtxNIEal5uvQvkwILAtVdnYhq7OrK0V41hm5A5BLnyDf/nJAJVEAt+FAn4TDZzMvqtO4x1r1gvPhhiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
@@ -71,10 +68,27 @@ hiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit.ladok.se/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <!--<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>-->
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>