From 700816809ad47ce1f57e8a8943b554fba328aed0 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Fri, 17 Jan 2014 14:17:55 +0100
Subject: kitstidp02.tst.ki.se added SWAMIDOPS-7108

---
 swamid-2.0/kitstidp02.tst.ki.se.xml | 102 ++++++++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                  |   1 +
 swamid-testing-sp-1.0.mxml          |   1 +
 3 files changed, 104 insertions(+)
 create mode 100644 swamid-2.0/kitstidp02.tst.ki.se.xml

diff --git a/swamid-2.0/kitstidp02.tst.ki.se.xml b/swamid-2.0/kitstidp02.tst.ki.se.xml
new file mode 100644
index 00000000..07d27163
--- /dev/null
+++ b/swamid-2.0/kitstidp02.tst.ki.se.xml
@@ -0,0 +1,102 @@
+<?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://kitstidp02.tst.ki.se">
+  <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#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/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://kitstidp02.tst.ki.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://kitstidp02.tst.ki.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Karolinska Institutet SP-Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karolinska Institutet SP Test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Test Service Provider för Karolinska Institutet.</mdui:Description>
+        <mdui:Description xml:lang="en">Test Service Provider for Karolinska Institutet.</mdui:Description>
+        <mdui:Logo height="146" width="292">https://kitstidp01.tst.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+        <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+        <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+        <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+        <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+        <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+        <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+        <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+        <mdui:DomainHint>ki.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>kitstidp02</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kitstidp02</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC5TCCAc2gAwIBAgIJALTTMvjLT7lIMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
+BAMTCmtpdHN0aWRwMDIwHhcNMTMxMjEyMTIyNTA2WhcNMjMxMjEwMTIyNTA2WjAV
+MRMwEQYDVQQDEwpraXRzdGlkcDAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAuAY3OYZqjtxC9a2iZG0/1/aF2cZ33WkGI52P61soqlhJcG+3iCrt04xn
+z8F8mKb4u59L7C/pHIXp9UrEpeWQyiG7u9YCADE/XLd5QAnZaD6u7hfjdvr5tkHw
+lzs1PngxnKzoHKkXnfIpvZ3uh9tD0QeUsbpcYY3c77pfGOlXit4/v5kFgwsG2TtX
+CIsmjUyl+Y6zq24Kb8BrZreEI3ffpXZj8RwwAHMc3i13lkK1jJRNUht9Kzict/Vd
+BbF0z/+snBbQ/v4el1DOd8fetg1xA5kz83n7GY8h+bro0fEeKCytIY8tJjB1lrdk
+wULoDChRirsc/fv8+hVnrUS8MQYLKwIDAQABozgwNjAVBgNVHREEDjAMggpraXRz
+dGlkcDAyMB0GA1UdDgQWBBRQz0WfY7Sk+K2r0r3fDM6+EOQlHDANBgkqhkiG9w0B
+AQUFAAOCAQEAH4d+XseboCssaOTWfI0l+QNf2qpxuuUCmiTChnxsuQzSv1F9MSjd
+CqZedSB89u+Amgp8CCoZfnzKHyVzZby3teKQqh91ibRetx22QZli2EO4T9V280gb
+TRc0X501Bmh4UxIidp2aggxRmAM87q+vSQ0AmRq/dYvOXdcDA+qcBe4ubPF+ZkR2
+Zy82MyoVbtnxT8PmfF+U4xpo9GP5I2dqKVaBY9ekzuJ68IP+WPh3kkEX2caCxNgZ
+5kCbrv3AXCHhjZEoG9p0m16DS2Oax3SYADeK7Oyu6/xxURri/ksmc6IoQCmqOAyO
++zSkNQ6zQoPdmVGGiwl5n8tZRnanItJ8dw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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://kitstidp02.tst.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kitstidp02.tst.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kitstidp02.tst.ki.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 db9e1ca2..935c8edb 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -266,4 +266,5 @@
   <xi:include href="swamid-2.0/wiki.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mp.uu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 04663046..a0cd37da 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -44,4 +44,5 @@
   <xi:include href="swamid-2.0/sigma-test-localhost-sp-130705.xml"/>
   <xi:include href="swamid-2.0/kisetest2.user.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml"/>
+  <xi:include href="swamid-2.0/kitstidp02.tst.ki.se.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3