2 files changed, 105 insertions, 19 deletions
diff --git a/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
new file mode 100644
index 00000000..1b9e4ec0
--- /dev/null
+++ b/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
@@ -0,0 +1,86 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_e76fedb97243073c5306cc0220ef35c8ef853075" entityID="https://ladok3edit.its.umu.se/gui-sp">
+
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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"/>
+    <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"/>
+  </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:Extensions>
+      <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://ladok3edit.its.umu.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://ladok3edit.its.umu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3edit</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3edit</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok3 är nästa generation av studieadministrativt systemstöd för universitet och högskolor i Sverige</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok3 is the next generation of the administration system for higher education in Sweden.</mdui:Description>
+        <mdui:Logo height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3edit.its.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3edit.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3edit.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAOUQv+esHSQiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWxhZG9rM2VkaXQuaXRzLnVtdS5zZTAeFw0xNjA0MjkxMTI3MzVaFw0yNjA0
+MjcxMTI3MzVaMCAxHjAcBgNVBAMTFWxhZG9rM2VkaXQuaXRzLnVtdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANoK0uyU7Kx91zBNTX4IU/qh7S0q
+P5CRW5lEDZmwjJRBsrIuYjumAW4h42iwK+zGgJ5vvqZ3wG8GfTejV7Gm5/v596/T
+vFhzpdvvho54sASGPID0jVwUnFd9XpB1cKxmdquj7CWxQmWnTTVdPfmeqYjulhOd
+JbvW1JSYExY2g21sDgMZlkN4eWA8tuVYruX6GzT7Xg1VEY5TXU3yInObiSOJDqUA
+3XqaTK0DzIhbsjTqt1IhEq8cSi6wpXpMe/ei9GosZ7sq4eGjzq1dPuZMQzBrr3K4
+zLWero4WKuGp+GdcoZIVYCGX4ESoN+fo4mtdfuyAmUw5Xhb0I9B0wgenj9UCAwEA
+AaNpMGcwRgYDVR0RBD8wPYIVbGFkb2szZWRpdC5pdHMudW11LnNlhiRodHRwczov
+L2xhZG9rM2VkaXQuaXRzLnVtdS5zZS9ndWktc3AwHQYDVR0OBBYEFNL5KblA3k+z
+vJW5lobq0Tgt918hMA0GCSqGSIb3DQEBBQUAA4IBAQBdsW3bVxKIfPKNkIEtkdXH
+gTiagL9DaBXpWLqBzr7qflPQvcIZtNjjmw+y34UI5j13UVLdeHJ7+Iutu0tJp/PI
+N8yzVlULCkm9DvuPRPIODEpA8VQZaNzI+90wy2p1XRw09h1s9O9hnMKkpBDn9f/m
+QEIBH/cBaJdemajGeYDMrYOZYXBGqbPonnsbdUMBpcqMsUNvwCTI4CIF6hjDN+oK
+Otxy3VC+n5I53dv05k5OFDXedHiS3cv3HzaAo9+GbahNOp22lIoPSg79bTfM+n2s
+aYnmCVGoNUbA+6Va0n9luhsqnA1TyI9HPOIbtbvAQ8kvU4ALw31YPGAxvzO1majX
+</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"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml
index cda6b480..347553ac 100644
--- a/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml
@@ -21,7 +21,7 @@
       <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/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -44,24 +44,24 @@
         <ds:KeyName>student.ate.grayzone.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.ate.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAKC5PITj5X4eMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQuYXRlLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDExMDcw
-OFoXDTI2MDMxMjExMDcwOFowKDEmMCQGA1UEAxMdc3R1ZGVudC5hdGUuZ3JheXpv
-bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrFS48
-pppSmK8vQdXPbk5Y0PAqw9/b5I/zROFFYQ7xpH/Qi5YKkT0fMEkzUL5Ymq7KKCV0
-sDAp6KtKZPP7TVMpr9mV6SsFL78T8TCIGiHnoomrbgspoocLxj5rW08shUCyS0gs
-88n4+s5HxQ8mkU3DlzsBa3RujKQiMkIDqtW8E7GzUNgVwKpHucjcWDVDMrhyMSHJ
-axX/gvIWywlo0+WeA+WrBWb4W/kkO51LRv+P3hAr7oFEsSHdWPEJTQqc6PMj8fpy
-gzGM6P/K7N8N4l3eBbPiS2DbvUfeS3ovc/SHWRFpd6Z659lsNI4/kSemA/Iecekf
-gtj27lvJYByhl55RAgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQuYXRlLmdy
-YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQuYXRlLmdyYXl6b25lLmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUB5dYMRo/rrKcf8mXKl/rrEeeSfQwDQYJ
-KoZIhvcNAQELBQADggEBAAPbPOcXeEEeb/qOOrOZa2uotrOx7md3jRkNQKqqy7nb
-T2kz//aJtct1GLhtlGHn1DnR5qZDJG1tSVvcG8dXHEZu+xXmHOtUKYnypD8JN+rj
-Upeo2MsSi1quGylaBmpJq1eB0X3CGRbfvBuiCiVFenPVot94z83Q/o7q8y3+mX28
-6ot0IZxzDEtLJi7BoV0mZWGXMQXNWG4avQld6XAxNC66MjOz0Up6tt7Mxxo0rmNM
-Q17iTUEcXA3MhSQ9twmRjjixtrjs38qZrYAbmvhPilTQ5vLGeRaeErY2ac/Pm2s/
-P85hD9Nccqj+TOPIJFB7fd6AoUGxjHQCi4yD3nqZ0vc=
+          <ds:X509Certificate>MIIDWzCCAkOgAwIBAgIJAORuSk6Eq23DMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
+BAMTHXN0dWRlbnQuYXRlLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDQyNzEyNDYy
+NloXDTI2MDQyNTEyNDYyNlowKDEmMCQGA1UEAxMdc3R1ZGVudC5hdGUuZ3JheXpv
+bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj+yBp
+XsiSe6jC2u+BctNk+VZTAsjnP6xPzoal/D35zX9SI5f9U+NObVjzsyPg3rJ+FOaj
+xLIr+gfuF9yOb8TMAjwDP119OIBBTW0zg+Qwh6LCbumP3TrtxqzcpBWIrAfpB2lf
+ZsNqO9AAjFLvw502G/NHYAFVIfIG4+4+U8ZvG8Vf24LrWRv6QNasYAUVAtnyXMX0
+MQ7j3DR5APlMlX8v/v2/hM7sulQYWG/B3dJtraOnJS0ChOi+qTIrel9qPkubSyAE
+JG5fu61RPQCqKZ8zrc03Pb0UwsHI+fuH1rqXW79JweIYlIaQZnDnX7VyH1fY13rA
+ym3GLSX6zETGzvk7AgMBAAGjgYcwgYQwYwYDVR0RBFwwWoIdc3R1ZGVudC5hdGUu
+Z3JheXpvbmUubGFkb2suc2WGOWh0dHBzOi8vc3R1ZGVudC5hdGUuZ3JheXpvbmUu
+bGFkb2suc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAdBgNVHQ4EFgQUcGYd638GO6By
+zxxRpJGgVd9/vS4wDQYJKoZIhvcNAQELBQADggEBADJsf5USxqSPcLxW8sXYRFmA
+y6clwJouncFvwm68R9vyRGVgVcj3CiZdLWwfCeEOgdQlosuNCH2iWxsqfOS8cXr3
+6qxY2fV6mPBKKZ5g1sjFOFY7c9jGmxk2wsWOwH8hKwpKp7jCH4wKC4UV5jeE6gxx
+nsJx+NtDQJf52Apw+StEyXWRdkXdsJqSJxi0ceeYsD5i+WQ4pl3asaHYbezokfv7
+I19MAsA3MUnDVe/RlhjZ4xc6qnWlR5CjDkLhx5YGUSWVflnD+e8jeKmC58ya1PBM
+mp4NftTztxnmXF+uwS5Yvi3egqAlAoGb1xO4omwJ3qlVbWdDXY4SwnMcGebOeac=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>