From 334505efdb98e069c181698075fd37bc8b54fb6e Mon Sep 17 00:00:00 2001
From: Anders Lördal <anders.lordal@hig.se>
Date: Wed, 3 Jun 2015 08:26:47 +0200
Subject: Resolves SWAMIDOPS-7697

---
 swamid-2.0/www.cvt.resultat.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.resultat.ladok.se-gui-sp.xml

diff --git a/swamid-2.0/www.cvt.resultat.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.resultat.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..7dd726bc
--- /dev/null
+++ b/swamid-2.0/www.cvt.resultat.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.resultat.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.cvt.resultat.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.resultat.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.cvt.resultat.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.cvt.resultat.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.cvt.resultat.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.resultat.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.cvt.resultat.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.cvt.resultat.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANRWEklIQkJdMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGXd3dy5jdnQucmVzdWx0YXQubGFkb2suc2UwHhcNMTUwNjAxMTMwNzQ2WhcN
+MjUwNTI5MTMwNzQ2WjAkMSIwIAYDVQQDExl3d3cuY3Z0LnJlc3VsdGF0LmxhZG9r
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BhXUfBLo/bFi1Uc
+aoc7ZzOhXTbELdSZ6uX+ta9Ka8g2E+KfaN6DkdvaHpGo1gySk4PZRUjXSV6iCDVe
+YLdaXxLTd5xCmlIGwXJjf9cnXkxf3NjCI1MKX1XrD8allnDx9shubn95Jb9up5VN
+rpjCPkGFdlGxXlHxrxEgCGAvb+OaGBM1W3Yxqd0F7svvPz7URfQN+lNNi3859Fpj
+GVEYiWaC3kpPuaDyaBLHTJzWI7XVmWvefscn3FBPaSJhkUBTD916OsVt0reh3Vpk
+T39elsIgPgFZnXnjy2q4c9oCagoVzgRy2F4YkS0KP4AAUsGfMallyELVR8UkjXy4
+KSS9RwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuY3Z0LnJlc3VsdGF0LmxhZG9r
+LnNlhihodHRwczovL3d3dy5jdnQucmVzdWx0YXQubGFkb2suc2UvZ3VpLXNwMB0G
+A1UdDgQWBBSdSVS95edPqMh1SEt3xrvXvFrJ3DANBgkqhkiG9w0BAQUFAAOCAQEA
+oazABzdDThU4urpnGYY9HgjCR+/X/RHBuZ3mKbw/xT8BSZyOjFEHVy3VCeYq6cSg
+l9mvej26ZJQOtJ1CyM5S0yuH1/nNqDYf2d/0gSI1xki+pW8rvRmjc8n6ytD/Ogmm
+uYO2XZSSrtyn2nzzsK/ggB5EYhva39eYSjZs7A+I3Bqr02WAxvHHmiAFjbwqWXah
+8cyb0W0g2LGY3OxDnL6/WdPtf7SlkG0SlYIzyYuUxwVyxE6fmmbh3vtAz31HPSv6
+NKGLr/S1a0KWFVvdPW6eJygzGFRvNKySQMrK68iqT0WNhUCm96GTZK9UgD6M9eyv
+e5qdCpfQZSj3HagN3WLoqA==
+</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.resultat.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.resultat.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.resultat.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.resultat.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.resultat.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.resultat.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 9bac85d5..24a5bdb5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -445,4 +445,5 @@
   <xi:include href="swamid-2.0/www.test.resultat.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-lu-student-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-lu-employee-sp.xml"/>
+  <xi:include href="swamid-2.0/www.cvt.resultat.ladok.se-gui-sp.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3