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

1 files changed, 36 insertions, 21 deletions

diff --git a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
index 87722f59..187b5a47 100644
--- a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit-ik.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-ik.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-ik.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 IK</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-ik.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.mit-ik.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-ik.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.mit-ik.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-ik.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.mit-ik.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANL6yf7/ut6nMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3d3dy5taXQtaWsubGFkb2suc2UwHhcNMTMxMjA1MTEyMzE2WhcNMjMxMjAz
-MTEyMzE2WjAeMRwwGgYDVQQDExN3d3cubWl0LWlrLmxhZG9rLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n5D2gQ7nHF/GL8+pjQwVWDCltO4Zxim
-8aN+KsuQexMHhDhQqrOsNY3smAbqKjyA50sZgc+kG2+pm5nJ3BtAFUJxOqHSsBFN
-hkpEmSlhXvN8z6GBW3PJU3X++LAi2PP6Cc5U1uLuROHjdlqhazCDB8iAPxkK4U2J
-SmtqokM+rlFWSqag+cL/rQuySL5JVAH1Ez9WmYd5bZQaC2acUwojuBAE+RUtkH/d
-int0TKVxLRiYitHsqoPnPjkaf2i+xek2793pO/5D0PWDSDKv+2uMoWDGguwGuJga
-76H+nO33kAM3CEaCpks9didq/vCf+OkUW6jIx7zDLYAldRhY9uvZiQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghN3d3cubWl0LWlrLmxhZG9rLnNlhiJodHRwczovL3d3dy5t
-aXQtaWsubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBR66X4ZBaD5XtilseE47n6e
-5rc6lDANBgkqhkiG9w0BAQUFAAOCAQEAka+wRN3C8Kv4SMDSjDhiIejGOZ4KZOXD
-LkUOt8AGlNTl7tzaQyznpuB4ojVemgAbnwAu2foUaERbqpD47XHzuBY7Ktmvd7ZN
-w5jZNJ5xf+W+WZ82dRhEvCtvn0acOC7bJhFAmhYQK5ZRQ3n87bxGB9WIGmUr1HKa
-Gw4/2Un4tYKbcbHpsVtrq/5ZOQRSbxcNKv+PZMCWVTvGI8Su7WQO2khvyDM8jfDK
-buip7GVO7Wnq60m3Ec56C5ZEokbcHqqy0phe/qJLj7gK0d78IN/gMJ0wGPRsUsgJ
-f7yN1uMpnUl12o/qmXNaqs7r1AOJ2CLfd+gRzYL9kS9FsLfKTrrwtg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANL6yf7/ut6nMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3d3dy5taXQtaWsubGFkb2suc2UwHhcNMTMxMjA1MTEyMzE2WhcNMjMxMjAzMTEyMzE2WjAeMRwwGgYDVQQDExN3d3cubWl0LWlrLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n5D2gQ7nHF/GL8+pjQwVWDCltO4Zxim8aN+KsuQexMHhDhQqrOsNY3smAbqKjyA50sZgc+kG2+pm5nJ3BtAFUJxOqHSsBFNhkpEmSlhXvN8z6GBW3PJU3X++LAi2PP6Cc5U1uLuROHjdlqhazCDB8iAPxkK4U2JSmtqokM+rlFWSqag+cL/rQuySL5JVAH1Ez9WmYd5bZQaC2acUwojuBAE+RUtkH/dint0TKVxLRiYitHsqoPnPjkaf2i+xek2793pO/5D0PWDSDKv+2uMoWDGguwGuJga76H+nO33kAM3CEaCpks9didq/vCf+OkUW6jIx7zDLYAldRhY9uvZiQIDAQABo2UwYzBCBgNVHREEOzA5ghN3d3cubWl0LWlrLmxhZG9rLnNlhiJodHRwczovL3d3dy5taXQtaWsubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBR66X4ZBaD5XtilseE47n6e5rc6lDANBgkqhkiG9w0BAQUFAAOCAQEAka+wRN3C8Kv4SMDSjDhiIejGOZ4KZOXDLkUOt8AGlNTl7tzaQyznpuB4ojVemgAbnwAu2foUaERbqpD47XHzuBY7Ktmvd7ZNw5jZNJ5xf+W+WZ82dRhEvCtvn0acOC7bJhFAmhYQK5ZRQ3n87bxGB9WIGmUr1HKaGw4/2Un4tYKbcbHpsVtrq/5ZOQRSbxcNKv+PZMCWVTvGI8Su7WQO2khvyDM8jfDKbuip7GVO7Wnq60m3Ec56C5ZEokbcHqqy0phe/qJLj7gK0d78IN/gMJ0wGPRsUsgJf7yN1uMpnUl12o/qmXNaqs7r1AOJ2CLfd+gRzYL9kS9FsLfKTrrwtg==</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"/>
@@ -76,4 +73,22 @@ f7yN1uMpnUl12o/qmXNaqs7r1AOJ2CLfd+gRzYL9kS9FsLfKTrrwtg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit-ik.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-ik.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>