From 59bde167f64dce72540428af44412aec78fca032 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 23 Mar 2016 16:47:47 +0100
Subject: Resolves SWAMIDOPS-8107 SWAMIDOPS-8108 SWAMIDOPS-8109

---
 .../student.grayzone.ladok.se-student-sp.xml       | 92 ++++++++++++++++++++++
 swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml    | 92 ++++++++++++++++++++++
 swamid-2.0/www.grayzone.ladok.se-gui-sp.xml        | 91 +++++++++++++++++++++
 swamid-sp-2.0.mxml                                 |  3 +
 4 files changed, 278 insertions(+)
 create mode 100644 swamid-2.0/student.grayzone.ladok.se-student-sp.xml
 create mode 100644 swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml
 create mode 100644 swamid-2.0/www.grayzone.ladok.se-gui-sp.xml

diff --git a/swamid-2.0/student.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.grayzone.ladok.se-student-sp.xml
new file mode 100644
index 00000000..ace5e0bf
--- /dev/null
+++ b/swamid-2.0/student.grayzone.ladok.se-student-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.grayzone.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: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://student.grayzone.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://student.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ladok student.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student.grayzone.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://student.grayzone.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://student.grayzone.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAIGkX/wOfnFpMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGXN0dWRlbnQuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTE0NjUyWhcN
+MjYwMzEyMTE0NjUyWjAkMSIwIAYDVQQDExlzdHVkZW50LmdyYXl6b25lLmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7EZ6ip4ed9S31sHM
+kn3u3Jt7CzPEhlhY6pIG3N/hIkeUeZns49ga3WCxr7mSsYmMLOkK/WmOmgRr6X7I
+r4zwwGaFxHuyBifOEn8pbBF9+NZU2odYAqjXCwTTgI7Dv7oOEnI83Qvpwsfvu/B/
+Z9cvgpWWmK9IWDlgdrJstC9m3y4LkeTpbWfRnJfvl8nSl9woDoUE0sc9BqKGXJIF
+EUepi55j51lHA66q1HU5G2rcDWXtC1zZ0b7qmsIRD16TMqODgwsOAdZF33LHxp2b
+lLONXk001RzjUi3b4CNVm+PNXzCwibQSwmxJNQdtBPk0acFnSgRZX2c0hBSwvAg+
+qJooXwIDAQABo3EwbzBOBgNVHREERzBFghlzdHVkZW50LmdyYXl6b25lLmxhZG9r
+LnNlhihodHRwczovL3N0dWRlbnQuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBSI2f1Krb20gR6VnpnH61B1vycoBTANBgkqhkiG9w0BAQsFAAOCAQEA
+K/pOvQFHi38hPYPWCZwOxfTGVye9orF5FSajYCyucrQLZhoDdj4e4gll/p33dHd8
+MevGPBcHvab4OetEonqLyTnauaGcummYfbu71SN+3cuyKuMuLuS6r6zjg4urKLTB
++T/ludsssL8Kh9JcZ9KNrCh6slW64WrvCs2/oZRBq6AK8S+1JxJWq25ooboaVxu+
+iL8W9vWi42ftSllQFlfaco3PwqFLyaLhI1Yf4BDQEPwVmliCRiLAOVMsF9Edfxr4
+3f0CFDF8FL3zPA2piWosG7hrENU5gNTWU4NW5J9PL9ElZNvcovBC2CMuz9W5Cciu
+SDtqcg4gkoVpkscIiQGWrw==
+</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://student.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..55b0bd07
--- /dev/null
+++ b/swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ete.grayzone.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.ete.grayzone.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.ete.grayzone.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.ete.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.ete.grayzone.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.ete.grayzone.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.ete.grayzone.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.ete.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.ete.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOWFYTqhNVvCMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGXd3dy5ldGUuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTIxODQ0WhcN
+MjYwMzEyMTIxODQ0WjAkMSIwIAYDVQQDExl3d3cuZXRlLmdyYXl6b25lLmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVBzGuFoS+tskR5h
+j5riw+TYtVOEoRzhhYadhWtDdHcVXzDhlCRjxUJh5ZaGMs2HQoU4fsuDOtc1FSx4
+5zfvXPlxrp1dAR6gIyzw/S3c7O++Y/eFcnEHeIp6Qj19ewe1IA0O01sGOKMFavjn
+HMSNqYr2jph0C/LxJxOz3aGzyJf7QdEzL9P6kqT3P5ZvmQwhTG5USlW/MBHvHkPl
+CEU3q7f5iJAgwCFrx2B+kcj/rqOgF09qoBPRx6P+UPpDZAwQ2GRZr4oTxugJD/7x
+EkSq/Ih+CuysSvj49kvuPtnyv3NzQtHr0v6OztvJGJrIvdYp5y9/8tOfZk67zze8
++VXX9wIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuZXRlLmdyYXl6b25lLmxhZG9r
+LnNlhihodHRwczovL3d3dy5ldGUuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBSLSbmYVzYDUUSx6oMPSF6CSX8TujANBgkqhkiG9w0BAQsFAAOCAQEA
+V1eergR3PJpB8MDSKi1yO4WWf3elAcpn/OcLc58hoem1dqnfc64sPVpRfKcfYSiR
+FAjTvJm1tSkXpYvKwMAPdfguBHODF1abm6BTTHBXnDG5Be8HvLf/apMKcWhBRwMh
+xLjcVBsD2JROhF8RpT6hs10RLPblWk2uyI79bBTgKdt9gfHaf9zk2SwDT26ll5WI
+CrdOV1fuoBg7Y7hejnuxzA/HS+B0l+Dxp19N4gKRZa2bp5X1CK7ZUGXW5sW6VhYW
+N2btwps3PZrInQGW94xgXB5upuxNEzoWLHhRdzGOaeO2Za3FefwH5Lkc7wD0Nez1
+xOLd3/SRsYXlsa7ueYeKiw==
+</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.ete.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.grayzone.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..f3e2aa08
--- /dev/null
+++ b/swamid-2.0/www.grayzone.ladok.se-gui-sp.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.grayzone.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.grayzone.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.grayzone.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.grayzone.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.grayzone.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.grayzone.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.grayzone.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.grayzone.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.grayzone.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAJgL/UIUo864MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXd3dy5ncmF5em9uZS5sYWRvay5zZTAeFw0xNjAzMTQxMTQ2MDhaFw0yNjAz
+MTIxMTQ2MDhaMCAxHjAcBgNVBAMTFXd3dy5ncmF5em9uZS5sYWRvay5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK0c7tP+s8ifn2gZFh6FO6MIcFh7
+pwHh9ZnS1c+zdSLcI+VzUu8koV0o4JMKqr/o9hKMDkrd2EXRUiTux3+k0ePLWBMq
+6PnSjnCO4U/Pr0+ZKRfVI1KzDv7BPyv0lP5+AtS1UeLUe9SLiCsAsDyNcchDXDQE
+KOo9GiAsVUXFfedshhdN1iSXWetyL1aCdqZ4lYFzjYygnZ3Y+YEfKbcEAAnJVUD5
+joBuUJxCFyTB1oceCAJ2GXwRV+LNn/ZqYzfr4NLTcx3SEmxCLn+6L7xxY6P1+6j5
+xMMDN1VOy3i+ErYcoOeiqKadL3KKIY0jt9Cg9++x7zG3sd+j9Fudu/zWHFMCAwEA
+AaNpMGcwRgYDVR0RBD8wPYIVd3d3LmdyYXl6b25lLmxhZG9rLnNlhiRodHRwczov
+L3d3dy5ncmF5em9uZS5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFD9mG85cKreL
+30kUPNS51OTXyhm8MA0GCSqGSIb3DQEBCwUAA4IBAQAMopCEYdbeBSVMLnqjJpgv
+GaQY1SNtI20IHcfzDKJogzjv/4UVcUFUO0VCI1RFmD8E7DfEUD3EZuYoX6+QkdEA
+PpL4bkfkcE1yfH2y7TYkt/7nbXqNYg/Rpg6tUYceXyriBKpuZia61Bx3moNtIKCO
+18S4vOyjGvh9MTuGMM81eRP4ZO6cCPxIimd4jyK9F7cqh8reB1skvO9+ghiak5sg
+YXMU0kj/IDNQQ9Hr2tj8e88rT15DRmjRI3dCCdrQ3geW+ZZkMm+bPdV1vfHGvG8+
+0yEVh0F2lpMEqdwLpcmqO8+/usorbJxs69tTG93PVbL3Oe3LfjV0EXKnwQkmlbRA
+</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.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f60ff67e..9f3cf2d9 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -514,4 +514,7 @@
   <xi:include href="swamid-2.0/student.cvt.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-kau-student-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-kau-employee-sp.xml"/>
+  <xi:include href="swamid-2.0/student.grayzone.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/www.grayzone.ladok.se-gui-sp.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3