ladok3edit added

student.ate.grayzone.ladok.se modified

2 files changed, 20 insertions, 19 deletions

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>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 14c81875..458d6597 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -573,4 +573,5 @@
   <xi:include href="swamid-2.0/ladok3test.its.umu.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/student.mit-ik.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/student.mit.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml"/>
 </md:EntitiesDescriptor>