summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Aslund <fredrik.aslund@umu.se>2016-04-26 12:23:59 +0200
committerFredrik Aslund <fredrik.aslund@umu.se>2016-04-26 12:23:59 +0200
commitbbfcd57fa20a822fb3e713d473c7aa5881b7270e (patch)
treeae788c0db35659f17e02e5943d37081b91301263
parente21b3be3c0178704df4261bb3dea341c7a3154b0 (diff)
utf fix
-rw-r--r--swamid-2.0/www.start.ladok.se-gui-sp.xml181
-rw-r--r--swamid-2.0/www.student.ladok.se-student-sp.xml183
2 files changed, 183 insertions, 181 deletions
diff --git a/swamid-2.0/www.start.ladok.se-gui-sp.xml b/swamid-2.0/www.start.ladok.se-gui-sp.xml
index 1af85a84..7a73d223 100644
--- a/swamid-2.0/www.start.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.start.ladok.se-gui-sp.xml
@@ -1,90 +1,91 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_www.start.ladok.se1461578755" entityID="https://www.start.ladok.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"/>
-<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/hei-service</samla:AttributeValue>
-<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-</samla:Attribute>
-</mdattr:EntityAttributes>
- </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://www.start.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.start.ladok.se/Shibboleth.sso/Login" index="1"/>
-<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-<mdui:DisplayName xml:lang="sv">Ladok www.start.ladok.se</mdui:DisplayName>
-<mdui:DisplayName xml:lang="en">Ladok www.start.ladok.se</mdui:DisplayName>
-<mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-<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 height="64" width="64">https://www.start.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-</mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.start.ladok.se/gui-sp</ds:KeyName>
- <ds:KeyName>www.start.ladok.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.start.ladok.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDIDCCAgigAwIBAgIJAJ9ZObDxOs3/MA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMTEnd3dy5zdGFydC5sYWRvay5zZTAeFw0xNjA0MjUxMDA1NTRaFw0yNjA0MjMx
-MDA1NTRaMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJoQ9FWIadS9qwygHOArRhD2zsKwK8AvOn00
-tZDk2atdpYO+ZZNnd2GjmdZg1ZLchfr3odvGDHzAtmuob3eTdWr+FSVkN2gs4zsq
-cYXOcyuHeO++xxuW7p0RVDG4Yoh/losV/Gc/DWHVtzlih85UWx1JUwk3r+5sprB2
-GxJEyR+0K8OA0pKnO4HY+I229g4b+gDVeiZT2mgpRdv5ZiKkSCCXDfktTxCzBr5r
-EORpjcQeGphJmkS2NrwAhz7LD8jmZCSn8C1HndhB6+syAh9uckcVgwo9TXqznTu9
-xx1He23MjYsZo79u7DuoMiDXY+8A7v4/CQ9DdFqcqfDfW7VcEi0CAwEAAaNjMGEw
-QAYDVR0RBDkwN4ISd3d3LnN0YXJ0LmxhZG9rLnNlhiFodHRwczovL3d3dy5zdGFy
-dC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFBTI2HIkkPdufvJjk7xyMM1ElUR3
-MA0GCSqGSIb3DQEBCwUAA4IBAQBiG3egtaHpHUefSZwdZtKe6TMV0WCDjHLVaBtG
-N8VYTJgkVwb3dU4nU5J1BnK4nRAEvxoOPRjy6QVvWuVhfWWa2wUJO2W+qbefu4UN
-FoB/q4SUYuzlMzZBcSheN/Xp1GtyfLY/0htNuL+V5dqCXqpDUDL+w/p920OUohQv
-StSkBn05CcRrrj+u9OvSDjEka1eMhx3QjRHyMQ4pytf/d5Z16aLE1Y5ow0IXKQ4/
-j63DbELE2yMbs7iEBCtgHuu/KlG8qhCWwhlP7QNHFhv3D0wKwREAtnOrDsuNVwKd
-afKPx82ANlnCVaJVclgEH/S2/fMYv1ZvrsvqK0siDLr5EEpH
-</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://www.start.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.start.ladok.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"/>
+ <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/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </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://www.start.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.start.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.start.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.start.ladok.se</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <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 height="64" width="64">https://www.start.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.start.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.start.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.start.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDIDCCAgigAwIBAgIJAJ9ZObDxOs3/MA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMTEnd3dy5zdGFydC5sYWRvay5zZTAeFw0xNjA0MjUxMDA1NTRaFw0yNjA0MjMx
+MDA1NTRaMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJoQ9FWIadS9qwygHOArRhD2zsKwK8AvOn00
+tZDk2atdpYO+ZZNnd2GjmdZg1ZLchfr3odvGDHzAtmuob3eTdWr+FSVkN2gs4zsq
+cYXOcyuHeO++xxuW7p0RVDG4Yoh/losV/Gc/DWHVtzlih85UWx1JUwk3r+5sprB2
+GxJEyR+0K8OA0pKnO4HY+I229g4b+gDVeiZT2mgpRdv5ZiKkSCCXDfktTxCzBr5r
+EORpjcQeGphJmkS2NrwAhz7LD8jmZCSn8C1HndhB6+syAh9uckcVgwo9TXqznTu9
+xx1He23MjYsZo79u7DuoMiDXY+8A7v4/CQ9DdFqcqfDfW7VcEi0CAwEAAaNjMGEw
+QAYDVR0RBDkwN4ISd3d3LnN0YXJ0LmxhZG9rLnNlhiFodHRwczovL3d3dy5zdGFy
+dC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFBTI2HIkkPdufvJjk7xyMM1ElUR3
+MA0GCSqGSIb3DQEBCwUAA4IBAQBiG3egtaHpHUefSZwdZtKe6TMV0WCDjHLVaBtG
+N8VYTJgkVwb3dU4nU5J1BnK4nRAEvxoOPRjy6QVvWuVhfWWa2wUJO2W+qbefu4UN
+FoB/q4SUYuzlMzZBcSheN/Xp1GtyfLY/0htNuL+V5dqCXqpDUDL+w/p920OUohQv
+StSkBn05CcRrrj+u9OvSDjEka1eMhx3QjRHyMQ4pytf/d5Z16aLE1Y5ow0IXKQ4/
+j63DbELE2yMbs7iEBCtgHuu/KlG8qhCWwhlP7QNHFhv3D0wKwREAtnOrDsuNVwKd
+afKPx82ANlnCVaJVclgEH/S2/fMYv1ZvrsvqK0siDLr5EEpH
+</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://www.start.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.student.ladok.se-student-sp.xml b/swamid-2.0/www.student.ladok.se-student-sp.xml
index d2a57430..e29bf709 100644
--- a/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -1,91 +1,92 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_www.student.ladok.se1461583653" entityID="https://www.student.ladok.se/student-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"/>
-<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/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:Attribute>
-</mdattr:EntityAttributes>
- </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://www.student.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.student.ladok.se/Shibboleth.sso/Login" index="1"/>
-<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-<mdui:DisplayName xml:lang="sv">Ladok www.student.ladok.se</mdui:DisplayName>
-<mdui:DisplayName xml:lang="en">Ladok www.student.ladok.se</mdui:DisplayName>
-<mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-<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 height="64" width="64">https://www.student.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-</mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.student.ladok.se/student-sp</ds:KeyName>
- <ds:KeyName>www.student.ladok.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.student.ladok.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAOCnVBGvbu36MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFHd3dy5zdHVkZW50LmxhZG9rLnNlMB4XDTE2MDQyNTExMjczMloXDTI2MDQy
-MzExMjczMlowHzEdMBsGA1UEAxMUd3d3LnN0dWRlbnQubGFkb2suc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHGKGOBwvvrybht4ptf12h7SjSW4WQ
-V7FdfyLJxAtoVH++3XgnsS88BhYNaOWYysUL2q+YH5qdq8ZfOrw0//VaHz2LEqqW
-LloG1sADvw1GyN+YZLmTOayhxpMp2MHxxM9tynhoyYeFF3GEvME9zJxkcmBN0oe0
-P+QLicuYnJNU8wDzpiV+k70DZttRTDp7z+ewVMaOPcrhkItiEzdDD0NE5YGo1kIg
-n8ZC7SdhWcIvgM/POeWM74VPmsTlN3Muf7+7T80EzhfbexANf4srflZLN7VS+Os4
-JWsbTh8qycOFu0M4llmOBgdC2BYKDoNXZGDCYE5ImWkjcn2pBMlsvp5HAgMBAAGj
-ZzBlMEQGA1UdEQQ9MDuCFHd3dy5zdHVkZW50LmxhZG9rLnNlhiNodHRwczovL3d3
-dy5zdHVkZW50LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUxMCnw4eJUufZfek3
-vLBmzfWrcw0wDQYJKoZIhvcNAQELBQADggEBADl0sb5+Ct83vuwR8m6DtxAy+QfG
-VJQsSHVzQw6n9XeWx5pREWNEDMUcZZ4/On+bi7KdY2WpDqgNJSTlSKKZ5b4vbQ4P
-0v0hyeHIvHYW+3QnQPta+oMf0lCi2+GTupVihw9NvwZgK0PjhXyG3ci5aWBWjd3a
-QvnJKt3hDgOf4Fvtih8OXhl89hyb6VsXA5v2wZk9M4QOoIraNOxnNH0ntqa/dSjU
-ixZQm1zM5PRAweCt9rLUgTrAwbfSykzaeHiRm5j4zJn/3frVs/b2ZyBNvVkujS1H
-xz4HZx54okaK76e3jPW6Hw8lPm8WEg05QDIkgjEKpQCY9hDXukP8NnV685Q=
-</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://www.student.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.student.ladok.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.student.ladok.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.ladok.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.ladok.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.student.ladok.se/student-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"/>
+ <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/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:Attribute>
+ </mdattr:EntityAttributes>
+ </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://www.student.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.student.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.student.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.student.ladok.se</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <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 height="64" width="64">https://www.student.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.student.ladok.se/student-sp</ds:KeyName>
+ <ds:KeyName>www.student.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.student.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAOCnVBGvbu36MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+BAMTFHd3dy5zdHVkZW50LmxhZG9rLnNlMB4XDTE2MDQyNTExMjczMloXDTI2MDQy
+MzExMjczMlowHzEdMBsGA1UEAxMUd3d3LnN0dWRlbnQubGFkb2suc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHGKGOBwvvrybht4ptf12h7SjSW4WQ
+V7FdfyLJxAtoVH++3XgnsS88BhYNaOWYysUL2q+YH5qdq8ZfOrw0//VaHz2LEqqW
+LloG1sADvw1GyN+YZLmTOayhxpMp2MHxxM9tynhoyYeFF3GEvME9zJxkcmBN0oe0
+P+QLicuYnJNU8wDzpiV+k70DZttRTDp7z+ewVMaOPcrhkItiEzdDD0NE5YGo1kIg
+n8ZC7SdhWcIvgM/POeWM74VPmsTlN3Muf7+7T80EzhfbexANf4srflZLN7VS+Os4
+JWsbTh8qycOFu0M4llmOBgdC2BYKDoNXZGDCYE5ImWkjcn2pBMlsvp5HAgMBAAGj
+ZzBlMEQGA1UdEQQ9MDuCFHd3dy5zdHVkZW50LmxhZG9rLnNlhiNodHRwczovL3d3
+dy5zdHVkZW50LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUxMCnw4eJUufZfek3
+vLBmzfWrcw0wDQYJKoZIhvcNAQELBQADggEBADl0sb5+Ct83vuwR8m6DtxAy+QfG
+VJQsSHVzQw6n9XeWx5pREWNEDMUcZZ4/On+bi7KdY2WpDqgNJSTlSKKZ5b4vbQ4P
+0v0hyeHIvHYW+3QnQPta+oMf0lCi2+GTupVihw9NvwZgK0PjhXyG3ci5aWBWjd3a
+QvnJKt3hDgOf4Fvtih8OXhl89hyb6VsXA5v2wZk9M4QOoIraNOxnNH0ntqa/dSjU
+ixZQm1zM5PRAweCt9rLUgTrAwbfSykzaeHiRm5j4zJn/3frVs/b2ZyBNvVkujS1H
+xz4HZx54okaK76e3jPW6Hw8lPm8WEg05QDIkgjEKpQCY9hDXukP8NnV685Q=
+</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://www.student.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.student.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.student.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>