From 431bcb41774d41c55a4ad6fa15385bc0ee3a76fb Mon Sep 17 00:00:00 2001
From: Fredrik Aslund <fredrik.aslund@umu.se>
Date: Fri, 6 Mar 2015 14:54:14 +0100
Subject: www.nvt.ar.ladok.se added SWAMIDOPS-7582

---
 swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml | 95 +++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                        |  1 +
 2 files changed, 96 insertions(+)
 create mode 100644 swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml

diff --git a/swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml b/swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..25c432e5
--- /dev/null
+++ b/swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nvt.ar.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:AttributeValue>http://refeds.org/category/research-and-scholarship</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.nvt.ar.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.nvt.ar.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.nvt.ar.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.nvt.ar.ladok.se</mdui:DisplayName>
+        <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.nvt.ar.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.nvt.ar.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.nvt.ar.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.nvt.ar.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALCnTLXPBNhAMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3d3dy5udnQuYXIubGFkb2suc2UwHhcNMTUwMzA2MTE1NDA5WhcNMjUwMzAz
+MTE1NDA5WjAeMRwwGgYDVQQDExN3d3cubnZ0LmFyLmxhZG9rLnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9Q2Ye1QrDRI1u0GJhrLG0j8i6tapcRiJ
+nBALGpG8dXh04apN8WJ1mTLGeW0VHvgYeardInfzXxheZTh89nFE9wADDxPxkmF9
+ZHvCkiGMOM1wejcIupyT/InZ8OIrh9mcuuK1MjJ0W5awOiBi+c+ibZwDhCtutzE/
+RIbWbNIXsLu8tl0dTXn+npDaa4PuYlfBHnrEKitA/B2y72JfSZqtn4JUdPa2ZoY4
+90g4UiZAJLB+U/uqigR9YdneCTA4caQAreIfwG50HVs4gYw9upn7pqkcLxafOUtq
+eYwI6hgK5ovvfSy5j0LGZ3jxuetH7Mpv8+BQgb4oaXpiNvkRm9SpZQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghN3d3cubnZ0LmFyLmxhZG9rLnNlhiJodHRwczovL3d3dy5u
+dnQuYXIubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBQ9SlTHCjEmb88tAkrYc0Qd
+UyMntDANBgkqhkiG9w0BAQUFAAOCAQEA5yJcv3VDqI2NAxCRjUUw0zXZvaJoXbYf
+aGcw+v9JoLQRXZFdR5FQ6e3Fl21BMFMbzVNHkcAaLJN2pL9qMf7QUcOd3CyuUKgd
+Jnd4HTYWJTjXB4J5B3cXZrfHd8pXuA6cM+McpTnF9lvBmxgRb/H9NF8rqkbHgD8c
+W3tputjUxL+Vnw9R+znIPD526wQaloaTGoejqfgl9EA0kVxOMObER6yQ0sj9xsl5
+lysGQwo1+xp0n4fB3zmXRPTUwnw6qxS81mVpW0uQFb0pxUeLcbf5PwKvL0vVGzJT
+JRxZMVwXFUuyy6QeZ//MHqoNR07si2v6641PxjQHTNTpskU/bJ4jAA==
+</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.nvt.ar.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nvt.ar.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 c1540f32..e525764c 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -354,4 +354,5 @@
   <xi:include href="swamid-2.0/play.kth.se-external-kaltura.com.xml"/>
   <xi:include href="swamid-2.0/acount-utv.hh.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3


From 994d47326f87a9c03385e60029d2a65080490ee0 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 9 Mar 2015 18:29:08 +0100
Subject: Resolves SWAMIDOPS-7585 Ny SP till SWAMID för Ladok www.ar.ladok.se
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 swamid-2.0/www.ar.ladok.se-gui-sp.xml | 95 +++++++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                    |  1 +
 2 files changed, 96 insertions(+)
 create mode 100644 swamid-2.0/www.ar.ladok.se-gui-sp.xml

diff --git a/swamid-2.0/www.ar.ladok.se-gui-sp.xml b/swamid-2.0/www.ar.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..de3690aa
--- /dev/null
+++ b/swamid-2.0/www.ar.ladok.se-gui-sp.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ar.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:AttributeValue>http://refeds.org/category/research-and-scholarship</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.ar.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.ar.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.ar.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.ar.ladok.se</mdui:DisplayName>
+        <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.ar.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.ar.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.ar.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.ar.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIJAO+2uVoFVCreMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD3d3dy5hci5sYWRvay5zZTAeFw0xNTAzMDkxMDUwMjZaFw0yNTAzMDYxMDUw
+MjZaMBoxGDAWBgNVBAMTD3d3dy5hci5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKYjGNsHJkf3igFiVKZP6DQFrEP2/wEs28PNp10Y+6Wt
+Vf0XjNlPXIrBAP+RrF4rq4n4xZ3Ryi5LR1Pzt2cEnhgeNmE+xB7JImrMpVFZamix
+DBkUR13uDFt3c35SL2mHVPVXkM8rrMk11QD9Ca4D98puHof33+uqb+IBdSExOI5W
+RnoWZADDKXiuEtTWIByF4poX1JGLBw7JlPWIle2Lrr59np5Iv1praiO7Z3hzGVon
+ZyLGBsvXiuxmy6XuTdS81ezAvCDS9yc4hKGaNU9qZP5pWHGwL5+wkCOCcfdrpyRA
+XHfvolYJLkjEH8/SDzSbhhpT19x0kl4m9lD3GiVFlYcCAwEAAaNdMFswOgYDVR0R
+BDMwMYIPd3d3LmFyLmxhZG9rLnNlhh5odHRwczovL3d3dy5hci5sYWRvay5zZS9n
+dWktc3AwHQYDVR0OBBYEFEFa4zqp6UAaaJtspYGraqM6BNoTMA0GCSqGSIb3DQEB
+BQUAA4IBAQB6o/jHsH5F1BtNTD3uQ6PQthEooYUJ8DmiXsIZCzDbsvglApyDKkKr
+kfnF+tKJjgrqo/DRUUJj+KOjM2P1Dl6cYq9hm89L6SCludbaNyiK79DOwc9kw9C/
+12l/UW+Vn0kfulPhHMo1yvZWY/92CvSpo4dXmH2qkw+/tjFm99n+kWtqAJW3Lb3R
+3rhEoFytiTQioexDPmhsv9SQf5DTaQhsPDqrHTkPEPZGZJUV9I7AxONRygByH5wk
+7hRKASv6cy2KVlXNyCFrrSD3cmADGzSFT5IsF4sE0JJBD0h6Rt6gJJSg24UyABoS
+H/CUrMqzIaj5b69wuVOW7xn85e2cMOCw
+</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.ar.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ar.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ar.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ar.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ar.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ar.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ar.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ar.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ar.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ar.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 e525764c..70604019 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -355,4 +355,5 @@
   <xi:include href="swamid-2.0/acount-utv.hh.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/www.ar.ladok.se-gui-sp.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3