1 files changed, 26 insertions, 11 deletions
diff --git a/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
index 4a4c19d5..b4f7ca91 100644
--- a/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.test.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-23T10:34:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -23,10 +20,17 @@
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-23T10:34:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.test.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.test.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +39,25 @@
         <mdui:DisplayName xml:lang="en">Ladok for students student.test.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.test.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.test.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://student.test.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.test.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.test.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMfe9MUSIYwzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTAeFw0xNjAzMTcxMDQ0MTRaFw0yNjAzMTUxMDQ0MTRaMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoXQxzxa7rCjHFU3SiCf9W//E5xgZugxikwRTBus+1XiT9oNDSiztbFPTGsUv/PLaSeyPs6hqd2bpBh3yOOItb/PCQJhGLVWFXZHSBifX4Aa+bh18ZbXtIPT8P+LhNMesdh6DVnDo5Ksd2cvbHxRO9WlNMbtzNM5iUJZiVfwmkwo3Y5xbWQ3NPCinmMQPWLVl0gKteoouu5SrCUm6s/TFNNIspQIJRUlieSn0MUyYCidLpadbNEarcC5wX4Pn9viA4ZBimiUcOzbPyxUcdLdW3bHUEOE/F0b/+34N4oBUytLcFo4nTlUjWaKBSv7dwFAYt0UjATVp+LdMwZmBcgrvsCAwEAAaNpMGcwRgYDVR0RBD8wPYIVc3R1ZGVudC50ZXN0LmxhZG9rLnNlhiRodHRwczovL3N0dWRlbnQudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFEdfw76scgUAy16cvwoO7eZP/DQbMA0GCSqGSIb3DQEBCwUAA4IBAQAdEWyyTL9P5TTNX0NuJmGAHNR/yi/RUIZ8vbFzuuSsFmMnKN+iVyQqnS0cWsHXs/KWNdziHSHcQusKp0l8Zmmb6Dj2adzigSVW22GNdFsDSRUkKuI70SP0gWCjlQ6pezYCNzNlG85VnMRHWkP461l2YUmMJSKSreltDQGom/gj9JDiFxaGr7puePNSyYqVX4AFY81u+JB5+tTTgyNhZRxcfUO4UUy2FV9/ugZdSEQmuL2TcPi/Qjr7iYf421GeoBUvEWeANRekKCb5IRhvWmw/KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://student.test.ladok.se/student-sp</ds:KeyName>
         <ds:KeyName>student.test.ladok.se</ds:KeyName>
@@ -71,11 +85,11 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
@@ -83,11 +97,12 @@
       <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>