SWAMID-411: New metadata for ladok3-idp and ladok3-idp:444 added

3 files changed, 220 insertions, 50 deletions

diff --git a/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml b/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml
new file mode 100644
index 00000000..574262d0
--- /dev/null
+++ b/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-idp.its.umu.se:444/proxy-sp/metadata.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-26T09:06:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <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://ladok3-idp.its.umu.se:444/proxy-sp/disco" index="1"/>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">Proxy-IdP for login during Ladok development</mdui:Description>
+        <mdui:Description xml:lang="sv">Proxy-IdP för inloggning i Ladoks utvecklingsmiljöer</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok3.its.umu.se/privacy-policy/index-en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok3.its.umu.se/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">Ladok development proxy-IdP dev</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok utveckling proxy-IdP dev</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFYTCCA0mgAwIBAgIJALV0mm6yCGH4MA0GCSqGSIb3DQEBCwUAMEcxFTATBgNV
+BAoMDHByb3h5LWlkcCBzcDEMMAoGA1UECwwDZGV2MSAwHgYDVQQDDBdsYWRvazMt
+aWRwLmxhZG9rLnVtdS5zZTAeFw0yMTEwMDUxOTU2NTlaFw0zMTEwMDMxOTU2NTla
+MEcxFTATBgNVBAoMDHByb3h5LWlkcCBzcDEMMAoGA1UECwwDZGV2MSAwHgYDVQQD
+DBdsYWRvazMtaWRwLmxhZG9rLnVtdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAM0sLzmlv5bXl8YSZ5rSqLofeGoD80lu7BICkYFpWNPAJnXlT3Dd
+pvWXZwzkUwm6b5tnPt+teo/uI/caLfEQAaFlMqAZEb94i1/ADAIBvBBDz3Wkyi9w
+H/8AV8ECUpaQB2ciqMe2eJL2/fwO5VhoO9nBmI9PexdBAQuMR1EnXR+k2OsmLapL
+OUMm7RmAio1JiZTSz5s1gqg06Yp/4lMOO3F+g/8JjNCaY6NSe0bsxi0rV7MApi97
+ufWPQ/Z/9dIfgxOM05uvqZNts5Jd4wFvrfA4ihUt8TX5oR3NX0Q8gl+M4Mlxz3Vz
+00MgyC6DWZ5IjLtLy4qPx7xELnjh+3deK3WETMKnMP86muV3RuXUJ2AiJST0P7d7
+tKjjsHD7U6PsKEFPh9UXkMKSk3ruMDDhXrs+e9rypzzz4mLX/bpY4ish0Bt2qDbu
+zuVPIM4zDb2WOyKk0nIV9ZU0ucN3E/fvOX2NBEA7R1YohZhDFyi+92GnTvrcG6lY
+h3ITcDAFP9H1OQl25SVRSQawvJmB0iaNg9CjoORVVk7SV+7ycwR1KOdC6qjaIqeh
+Dr1D1Ip/a67rpW1quHH8X0dEaLrUVfoXruhU8Jr1uxcqX/tU0YY/0bgwt+2z1kG8
++xP8M68bt6RsC+PI9ko23Zd5Wt7PNlXXL6BfnPX/XSQcuzt5Ortrl1mNAgMBAAGj
+UDBOMB0GA1UdDgQWBBQouS+FD6lRgCqc30JxxdrFgBMzeDAfBgNVHSMEGDAWgBQo
+uS+FD6lRgCqc30JxxdrFgBMzeDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
+A4ICAQBek0Z/eRU9op7evOMRT1r/D0Td07n2dCPHMAA3C4uF6HfRYKGqUYDNJo91
+Bh3qBGi7C5TQ0FWVP9kWbU5jf+CCODhp/XhgfBxLn2dTWto6QURP75newSVuRn/v
+t+FnbG4cZDfvKmHpMtUGID2otoJ0IZJRqzTmeCXIbKnhtB/h+mB3KfwqiTNzswAC
+/3hiLFTkzkqXobPF0+MJiONkZ0KoeiuPruUxsbo5z0abHlTmn3kQLL8lNtZzOn0f
+iY5AbHbQqrDJko8cDXf5CbUyNx1bqqSzdmPj/G/PTkPT6gX6qWtCCQQqdohyfiMu
+ofR8B+j2Fe/to4JfM3WL06n1HIDostIh53ubaoRd0/IgIBuU2u3ma58RpO0cMP76
+R5lsNF7iw9xzKK1aMPZLn14UXokgPy8pUgQ4xUIjRVbUeUr8zZGXnEOj5/4M6Mi8
+GjUs4n1O+cjOB0UJgRU5Ipp6f2l9UVLXOw/I5/1UuWCm87imwrYBXEIByhWwMShQ
+fLw0OqhCigBRCiTEeQvCMs+UsjD8HRQPE9u+KZ0GSFA5jYtMA1bMXTwbYn5hOJXO
+6umXoEksgvGAQ6nONdg9oLULZDokngXeY58Hd/n6WNdFqvHmYO6OcFHLglDtgCx1
+E3K+Nek3fliiQKu+T2TDYqmDIkj17Iva2ZkSYycyU9nTLiWXyg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFYTCCA0mgAwIBAgIJALV0mm6yCGH4MA0GCSqGSIb3DQEBCwUAMEcxFTATBgNV
+BAoMDHByb3h5LWlkcCBzcDEMMAoGA1UECwwDZGV2MSAwHgYDVQQDDBdsYWRvazMt
+aWRwLmxhZG9rLnVtdS5zZTAeFw0yMTEwMDUxOTU2NTlaFw0zMTEwMDMxOTU2NTla
+MEcxFTATBgNVBAoMDHByb3h5LWlkcCBzcDEMMAoGA1UECwwDZGV2MSAwHgYDVQQD
+DBdsYWRvazMtaWRwLmxhZG9rLnVtdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAM0sLzmlv5bXl8YSZ5rSqLofeGoD80lu7BICkYFpWNPAJnXlT3Dd
+pvWXZwzkUwm6b5tnPt+teo/uI/caLfEQAaFlMqAZEb94i1/ADAIBvBBDz3Wkyi9w
+H/8AV8ECUpaQB2ciqMe2eJL2/fwO5VhoO9nBmI9PexdBAQuMR1EnXR+k2OsmLapL
+OUMm7RmAio1JiZTSz5s1gqg06Yp/4lMOO3F+g/8JjNCaY6NSe0bsxi0rV7MApi97
+ufWPQ/Z/9dIfgxOM05uvqZNts5Jd4wFvrfA4ihUt8TX5oR3NX0Q8gl+M4Mlxz3Vz
+00MgyC6DWZ5IjLtLy4qPx7xELnjh+3deK3WETMKnMP86muV3RuXUJ2AiJST0P7d7
+tKjjsHD7U6PsKEFPh9UXkMKSk3ruMDDhXrs+e9rypzzz4mLX/bpY4ish0Bt2qDbu
+zuVPIM4zDb2WOyKk0nIV9ZU0ucN3E/fvOX2NBEA7R1YohZhDFyi+92GnTvrcG6lY
+h3ITcDAFP9H1OQl25SVRSQawvJmB0iaNg9CjoORVVk7SV+7ycwR1KOdC6qjaIqeh
+Dr1D1Ip/a67rpW1quHH8X0dEaLrUVfoXruhU8Jr1uxcqX/tU0YY/0bgwt+2z1kG8
++xP8M68bt6RsC+PI9ko23Zd5Wt7PNlXXL6BfnPX/XSQcuzt5Ortrl1mNAgMBAAGj
+UDBOMB0GA1UdDgQWBBQouS+FD6lRgCqc30JxxdrFgBMzeDAfBgNVHSMEGDAWgBQo
+uS+FD6lRgCqc30JxxdrFgBMzeDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
+A4ICAQBek0Z/eRU9op7evOMRT1r/D0Td07n2dCPHMAA3C4uF6HfRYKGqUYDNJo91
+Bh3qBGi7C5TQ0FWVP9kWbU5jf+CCODhp/XhgfBxLn2dTWto6QURP75newSVuRn/v
+t+FnbG4cZDfvKmHpMtUGID2otoJ0IZJRqzTmeCXIbKnhtB/h+mB3KfwqiTNzswAC
+/3hiLFTkzkqXobPF0+MJiONkZ0KoeiuPruUxsbo5z0abHlTmn3kQLL8lNtZzOn0f
+iY5AbHbQqrDJko8cDXf5CbUyNx1bqqSzdmPj/G/PTkPT6gX6qWtCCQQqdohyfiMu
+ofR8B+j2Fe/to4JfM3WL06n1HIDostIh53ubaoRd0/IgIBuU2u3ma58RpO0cMP76
+R5lsNF7iw9xzKK1aMPZLn14UXokgPy8pUgQ4xUIjRVbUeUr8zZGXnEOj5/4M6Mi8
+GjUs4n1O+cjOB0UJgRU5Ipp6f2l9UVLXOw/I5/1UuWCm87imwrYBXEIByhWwMShQ
+fLw0OqhCigBRCiTEeQvCMs+UsjD8HRQPE9u+KZ0GSFA5jYtMA1bMXTwbYn5hOJXO
+6umXoEksgvGAQ6nONdg9oLULZDokngXeY58Hd/n6WNdFqvHmYO6OcFHLglDtgCx1
+E3K+Nek3fliiQKu+T2TDYqmDIkj17Iva2ZkSYycyU9nTLiWXyg==
+</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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-idp.its.umu.se:444/proxy-sp/acs/post" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Ladok development proxy-IdP dev</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ladok utveckling proxy-IdP dev</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladok</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>mailto: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>Ladok-supporten</md:SurName>
+    <md:EmailAddress>mailto: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>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml b/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml
index 5c687590..a46f9acd 100644
--- a/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml
+++ b/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml
@@ -10,41 +10,52 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <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://ladok3-idp.its.umu.se/proxy-sp/disco" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok utveckling proxy-IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok development proxy-IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Proxy-IdP för inloggning i Ladoks utvecklingsmiljöer</mdui:Description>
         <mdui:Description xml:lang="en">Proxy-IdP for login during Ladok development</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Proxy-IdP för inloggning i Ladoks utvecklingsmiljöer</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Ladok development proxy-IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok utveckling proxy-IdP</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok3.its.umu.se/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok3.its.umu.se/privacy-policy/index-en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok3.its.umu.se/privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDVzCCAj+gAwIBAgIJAJGffFwSG5i0MA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNV
-BAYTAlNFMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
-Q29tcGFueSBMdGQwHhcNMjEwMjE5MTAzNzM5WhcNMjIwMjE5MTAzNzM5WjBCMQsw
-CQYDVQQGEwJTRTEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZh
-dWx0IENvbXBhbnkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-xCPa1DHzbrbc98IO/OQR8zmJETOGGxMd52m/I1j0NclImALzwXguPcUWqG78S+os
-QijGZb57sG+v+d/FAISU04wllx3fRJ/P+nAF1d4sqg220Uxb0VTjF7uyzI5w5XVI
-eweL3tgBhyg3IpD7dWtV7j+3LsKz+HM/O0Jhmwwdu6BXrEwiSLUFWY/cfaryLMEI
-np1YSWmDw6SNnmEHdQxc0sG39jnRcpMQ/JoqcWD/1BY2e7wqAjhIbEbDScv4ht8T
-TmDq7eSkUL7T2BglRFJB6HsugUnz+1AnRjCyS9fZcqB6/DapZPzTtemUdg9/p+K5
-5I5FJvOZb6Qml1boAzpXkQIDAQABo1AwTjAdBgNVHQ4EFgQUJY85c5rIToBk6uOf
-ZlKKlUzHRAwwHwYDVR0jBBgwFoAUJY85c5rIToBk6uOfZlKKlUzHRAwwDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAtuMqvYLPd5S2h1afHTduI0Ou1UVf
-7AwQkTUd1DLFFJZEq7rqRknLD2mXDu4ZxjR3V2LIm6EM5oy31KUD5M4V0sVy8SVl
-DbL+EmwAJgJnVTAq1WbnWHehcMG8GtKdOu4eb0cajhL1OhqN5XFKCaueYorFLicF
-MpQnfILkvhvOjyVgMv2VJ2Q8n5bVvuG3gK5LrFNX2DgOk+3Yy2rLlUvIcgmrIqnk
-WfZQLPuXiU8DPzOyTaea3MYjJJeDWFi+bOE5FQILjbX3kUM1XeYSYOn1PTZ5roJo
-ZwefI2ldqjjEpUiLwDnEwNqdglFSigOsAhu85P0S78xLWPim8pogfLgAMA==
+          <ds:X509Certificate>MIIFRTCCAy2gAwIBAgIJAN2mem/BlUMIMA0GCSqGSIb3DQEBCwUAMDkxFTATBgNV
+BAoMDHByb3h5LWlkcCBzcDEgMB4GA1UEAwwXbGFkb2szLWlkcC5sYWRvay51bXUu
+c2UwHhcNMjExMDA1MTk1NjEyWhcNMzExMDAzMTk1NjEyWjA5MRUwEwYDVQQKDAxw
+cm94eS1pZHAgc3AxIDAeBgNVBAMMF2xhZG9rMy1pZHAubGFkb2sudW11LnNlMIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsnAC9xGDDZ0PaMiJlwpBGtfE
+gRUbFfRIXp1+aYpdpUh0WpsE/9jTpMX/i3mkq4NLfkgmjKFt+xvYYc8U/WBSAmGT
+OTERA8koYVFfJVypSqMVTIH6M0BJPBIC2Qu+AcuzfhL66yVrW2PQq7E5PBUKRzch
+QbP4HiXjBbhI73xHgugVtjZ0xuid4MAm57Kuk4IdcroRHEXOW8h/NCzNBVvTBBHH
+tHXHp9iHlJ46KmUT/MoSTSNEBurLbX1bM+Vp888aYyhVFzb3hVrjKGj4JKAemZbi
+SGa4C2th0TuYdLHXNqjOO13Wvqgh4t3VmSyo1h8v2SLlwo1xCISYOhxz9bDyIpdj
+AgM853XLyp5gL10xtIBoePZ0jFCvHzJE2otKQstQP7pgTXPQ2ktfDPlVpxSe/W+O
+T1mbPh5gRHwojX8YQDbY+gfemgQ/lLONwUsot5G2HcKKtCoUhsdldueDICfLO21+
+WBpTzg84z+0RHYaxtIRNUo1XgilxMa8EdfEDdGgpwo21bBrBXn1bOsXA5joopWDE
+XrgAQEZ9ToFtjs3yGitvUZGeM7JcgoGMexI6cNa5qzaltVGneKSzxfETn7OKAyAE
+ydIpBqnN0HW93ba2N3Lu+d/5sRtvpM2PnhGDy3pxe16lv63skKX+mo3lVCnP0BlH
+CHDujkV48O45WdexabUCAwEAAaNQME4wHQYDVR0OBBYEFP/E+ZQCFftPgooyOI7c
+st4p9IsvMB8GA1UdIwQYMBaAFP/E+ZQCFftPgooyOI7cst4p9IsvMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAKIOTaozf/84e7RG+ZY/E7OEWbAdVdAY
+hgnT6WzyHdd8l/9xcX7OjPW32l1EpZbUwqMDp+NU1Y9Ry8bBtSDyY0KtxXZePu5X
+t1QEBmpIu/zBNCOo0WGVxxGdsEd6APdSWzyhK18JaxPHZRbpkh8oNHxpLVgrQSvh
+qrn4PYEe5PKv2TxcsbiRKe8qTTz9O+ALlWpYKl1lfcjcUQimKBh386wx9Jwf38G5
+mcPberEY4ksjHbw6iVN3YKm5hqYaLE4JIaYZZeKCUOGvWPKyTycStlWCIaVvKz3q
+qYQcxmdw1X6HWhsc3vZt6R+cdicybWG5E74zTaili8KpHqh8QltnOIAPcXvfDefC
+rpxS00S5FQzT7+bE+FM/ymxd8Q3US5B0EeQh8V+DCOYr0MFbSeXGy667yxCj2Jen
+DvZ/JIsotgCFbUd1dZETPA62a/bxRWBxXmB0g49Mx8tg5GkJL+JD0PaQOCotzKmH
+ekO2UfkPQWDq+TaQbpp8qd4f6UxYJtOV6ql8sixeoaeCnaR4hd1W1u8jVw1QLxM8
+j8ql9NKsj1qTgIh3Y2Bgt0I+K4X151QHxNiV9FFDZ3SNKQlhwpFCdlOBof/NjOmn
+8+OLd7t9xOmbZBDCSkq2Pl5v4EkKARcZN/sqEl0zPz/GOlIQ72Gjpp/vFyglCcjg
+9uE+IsfptCMr
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -52,24 +63,35 @@ ZwefI2ldqjjEpUiLwDnEwNqdglFSigOsAhu85P0S78xLWPim8pogfLgAMA==
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDVzCCAj+gAwIBAgIJAIpfdCdM+nmUMA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNV
-BAYTAlNFMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
-Q29tcGFueSBMdGQwHhcNMjEwMjE5MTcwMTI0WhcNMjIwMjE5MTcwMTI0WjBCMQsw
-CQYDVQQGEwJTRTEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZh
-dWx0IENvbXBhbnkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-uqJ8TZs5PFuiR5BPX1kw2CxWS8TgLSv50b0gQ2oqrTCKkTBPw48iWUZyPM9QnNBP
-D+cuZKjHL2lJ3JI7wlUvSKJh3ghhNwi4+HIVqynky66wFiIu9boVsLoQmubWSELM
-JXBk8a6f32gFdqlvjvtNvS7wzjIQ/7uwMB5X0I12Y/ztJE0MFLX6IfKcgoSuAo6Y
-S4A0Tn3SzZXqZLtQwFk6nVy+uvO7kYUcromgFrT2jvZ8BOASpcVHKckI/6H91V9Z
-3Krr8BV2H+IJscBGVg45KqrFysrQBijm6Y9oumdazUQFzTWf0+T20m/cXWeMz0Pn
-csdxWAZS4N4Hh/dtlusnawIDAQABo1AwTjAdBgNVHQ4EFgQUpkgOGQoqEgoWTGO+
-+r6Y5L+W520wHwYDVR0jBBgwFoAUpkgOGQoqEgoWTGO++r6Y5L+W520wDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAeiDR9XlYH51jbQiL5DyoqD4hmFeK
-6b7kiZ47I0JrJsTqVPhxr5SvhGnnion/WkmosLO4W9WEjAq9EPn80j1QsoT6yCZV
-/+VtdRh+ZzANrdcm282gw9bnzI3/OvinorRorOi++zs8EXY8NDCOG5g+lVlh17VZ
-VN0Q5JSlsKtcuwK78oyWl1XZ4sB0HtTOBTEqXyVGvyLdAEgNdm/Y+dqsXG2FeqyU
-kOQPObKT4BBZpKiLt5/QK0716uCMDsrTLsQx4y/wYPuOHEw0IMF7lIiKYy0SV74k
-dTPoT2JDn3PIIXK+E34X8dVfSM1WwTWCNmkZYeikzGq7UxVeGzybwMfTPg==
+          <ds:X509Certificate>MIIFRTCCAy2gAwIBAgIJAN2mem/BlUMIMA0GCSqGSIb3DQEBCwUAMDkxFTATBgNV
+BAoMDHByb3h5LWlkcCBzcDEgMB4GA1UEAwwXbGFkb2szLWlkcC5sYWRvay51bXUu
+c2UwHhcNMjExMDA1MTk1NjEyWhcNMzExMDAzMTk1NjEyWjA5MRUwEwYDVQQKDAxw
+cm94eS1pZHAgc3AxIDAeBgNVBAMMF2xhZG9rMy1pZHAubGFkb2sudW11LnNlMIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsnAC9xGDDZ0PaMiJlwpBGtfE
+gRUbFfRIXp1+aYpdpUh0WpsE/9jTpMX/i3mkq4NLfkgmjKFt+xvYYc8U/WBSAmGT
+OTERA8koYVFfJVypSqMVTIH6M0BJPBIC2Qu+AcuzfhL66yVrW2PQq7E5PBUKRzch
+QbP4HiXjBbhI73xHgugVtjZ0xuid4MAm57Kuk4IdcroRHEXOW8h/NCzNBVvTBBHH
+tHXHp9iHlJ46KmUT/MoSTSNEBurLbX1bM+Vp888aYyhVFzb3hVrjKGj4JKAemZbi
+SGa4C2th0TuYdLHXNqjOO13Wvqgh4t3VmSyo1h8v2SLlwo1xCISYOhxz9bDyIpdj
+AgM853XLyp5gL10xtIBoePZ0jFCvHzJE2otKQstQP7pgTXPQ2ktfDPlVpxSe/W+O
+T1mbPh5gRHwojX8YQDbY+gfemgQ/lLONwUsot5G2HcKKtCoUhsdldueDICfLO21+
+WBpTzg84z+0RHYaxtIRNUo1XgilxMa8EdfEDdGgpwo21bBrBXn1bOsXA5joopWDE
+XrgAQEZ9ToFtjs3yGitvUZGeM7JcgoGMexI6cNa5qzaltVGneKSzxfETn7OKAyAE
+ydIpBqnN0HW93ba2N3Lu+d/5sRtvpM2PnhGDy3pxe16lv63skKX+mo3lVCnP0BlH
+CHDujkV48O45WdexabUCAwEAAaNQME4wHQYDVR0OBBYEFP/E+ZQCFftPgooyOI7c
+st4p9IsvMB8GA1UdIwQYMBaAFP/E+ZQCFftPgooyOI7cst4p9IsvMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAKIOTaozf/84e7RG+ZY/E7OEWbAdVdAY
+hgnT6WzyHdd8l/9xcX7OjPW32l1EpZbUwqMDp+NU1Y9Ry8bBtSDyY0KtxXZePu5X
+t1QEBmpIu/zBNCOo0WGVxxGdsEd6APdSWzyhK18JaxPHZRbpkh8oNHxpLVgrQSvh
+qrn4PYEe5PKv2TxcsbiRKe8qTTz9O+ALlWpYKl1lfcjcUQimKBh386wx9Jwf38G5
+mcPberEY4ksjHbw6iVN3YKm5hqYaLE4JIaYZZeKCUOGvWPKyTycStlWCIaVvKz3q
+qYQcxmdw1X6HWhsc3vZt6R+cdicybWG5E74zTaili8KpHqh8QltnOIAPcXvfDefC
+rpxS00S5FQzT7+bE+FM/ymxd8Q3US5B0EeQh8V+DCOYr0MFbSeXGy667yxCj2Jen
+DvZ/JIsotgCFbUd1dZETPA62a/bxRWBxXmB0g49Mx8tg5GkJL+JD0PaQOCotzKmH
+ekO2UfkPQWDq+TaQbpp8qd4f6UxYJtOV6ql8sixeoaeCnaR4hd1W1u8jVw1QLxM8
+j8ql9NKsj1qTgIh3Y2Bgt0I+K4X151QHxNiV9FFDZ3SNKQlhwpFCdlOBof/NjOmn
+8+OLd7t9xOmbZBDCSkq2Pl5v4EkKARcZN/sqEl0zPz/GOlIQ72Gjpp/vFyglCcjg
+9uE+IsfptCMr
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -80,13 +102,13 @@ dTPoT2JDn3PIIXK+E34X8dVfSM1WwTWCNmkZYeikzGq7UxVeGzybwMfTPg==
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Ladok development proxy-IdP</md:ServiceName>
       <md:ServiceName xml:lang="sv">Ladok utveckling proxy-IdP</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -97,19 +119,19 @@ dTPoT2JDn3PIIXK+E34X8dVfSM1WwTWCNmkZYeikzGq7UxVeGzybwMfTPg==
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
@@ -119,5 +141,6 @@ dTPoT2JDn3PIIXK+E34X8dVfSM1WwTWCNmkZYeikzGq7UxVeGzybwMfTPg==
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 5eeeb285..623d779b 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -676,7 +676,7 @@
   <xi:include href="swamid-2.0/visp.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/stage.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tse-uu.sitevision.se.xml"/>
-  <xi:include href="swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml"/>
+  <xi:include href="swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/rehab.test.uu.se-ticketserver-.xml"/>
@@ -703,4 +703,5 @@
   <xi:include href="swamid-2.0/jss.kau.se-8443-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml"/>
 </md:EntitiesDescriptor>