From 66ef3221092837a086b298e233f7109527b3ef77 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 26 Oct 2015 15:34:50 +0100
Subject: Resolves SWAMIDOPS-7864 Add www.cvt.uppfoljning.ladok.se

---
 swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml | 92 ++++++++++++++++++++++
 swamid-sp-2.0.mxml                                 |  1 +
 2 files changed, 93 insertions(+)
 create mode 100644 swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml

diff --git a/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..a19a0648
--- /dev/null
+++ b/swamid-2.0/www.cvt.uppfoljning.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.cvt.uppfoljning.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.cvt.uppfoljning.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.cvt.uppfoljning.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.env.uppfoljning.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.env.uppfoljning.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:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:Logo height="64" width="64">https://www.env.uppfoljning.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.cvt.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.cvt.uppfoljning.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.cvt.uppfoljning.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJiQ6Y4LQA2rMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHHd3dy5jdnQudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUxMDIyMTMyODM1
+WhcNMjUxMDE5MTMyODM1WjAnMSUwIwYDVQQDExx3d3cuY3Z0LnVwcGZvbGpuaW5n
+LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1HEGTRbi
+gDbH0FVYPs6k4lKZ5MxM3nxAoSXcRDVizojNNzlsiy9VhqpUZyhJS3PWTd4ORII+
+PZxvApKOGMuIV4HElXfeX7YGm/v4KdXro2Sk5U5KVNzfg43Snb7oRS3pq9km2Uzr
+BmxiMwVxbzROnSfePal1wRyXqQwQJOXTLqLm9XBFC1Z3autwVLvn1YQ8t/c21QK8
+HeoxGGQAlf5IlsetiXNoJH714+ovpsbnlpZB9ZEU8gF+E2j/igGA1YxfcKNbusBi
+Ks6olO37lwb0kmULooqEwVIQRXfncOzx/O8QJI9FJWrHQlFmzFre6TAQ/iSVByb6
+rSPw0PXKNzyKYwIDAQABo3cwdTBUBgNVHREETTBLghx3d3cuY3Z0LnVwcGZvbGpu
+aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy5jdnQudXBwZm9sam5pbmcubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBRqHw1wOSeUjkz37X5oJtxCZwq3MDANBgkqhkiG
+9w0BAQUFAAOCAQEAVCyTPqAjAYrbO0t9nj/Vma1hbF2Y2rgBpjQDuSOIPuiFNjgw
+l6QVMhxbroL5FcWnYQ5eJAHGMgs7THDKvEs7lLo8hReyA/gyhtv+wnWw75Zdf7G3
+W5EKt6m0g4T0I6vLykleVx5iGcGGWWUKqBcqOEdEtVSnThPo6+qfGNa0+wAU+wYk
+dcRieDbdpuiP1i98Q6xHyHdufBFWypbxd7ay7/978uHhrMt06zgvBqcN0c6vDAEn
+JN8DBjzaLWDIVRmzVzcl/0rdt5hrTbdsWzWr06BNOXjapzJ+YlQ7efSLJDGlyeek
+Amc24v5TLThVrOsV13FA5SIl4sa5rwDvh3WoSw==
+</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.cvt.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.uppfoljning.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 e3dc6e85..65a3c63f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -469,4 +469,5 @@
   <xi:include href="swamid-2.0/lubas-test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ubas-test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3