swamid-1.0* removed

nya-1.0* removed
non-used metadata moved to swamid-2.0-obsolete
swamid-1.0/* moved to swamid-2.0/
nya-1.0/* moved to swamid-2.0/
mxml cleaned from swamid-1.0 data
Makefile cleaned from nya-1.0 and swamid-1.0 data

1 files changed, 70 insertions, 0 deletions

diff --git a/swamid-2.0/kisetest2.user.ki.se-shibboleth.xml b/swamid-2.0/kisetest2.user.ki.se-shibboleth.xml
new file mode 100644
index 00000000..725fe618
--- /dev/null
+++ b/swamid-2.0/kisetest2.user.ki.se-shibboleth.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kisetest2.user.ki.se/shibboleth">
+  <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"/>
+  </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://kisetest2.user.ki.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://kisetest2.user.ki.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">ki.se - Karolinska Institutets webbplats</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ki.se - the website of Karolinska Institutet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Karolinska Institutets publika webbplats</mdui:Description>
+        <mdui:Description xml:lang="en">This is the public website of Karolinska Institutet</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>web7.user.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=web7.user.ki.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAJHn96UILtRyMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD3dlYjcudXNlci5raS5zZTAeFw0xMzA0MjQxMTU1NDhaFw0yMzA0MjIxMTU1
+NDhaMBoxGDAWBgNVBAMTD3dlYjcudXNlci5raS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMdwiyDUXvz6QWYMr5qBMdBz1kili2HhHw4y7LD11Pfg
+h7hJzUssQFjWMahYeFnoK4Up9mL5WNQ6Km9aDqG52NRrJPDWq5yrBDqbop+2kLxH
+8HUXYA0XsF3tDu022RR1j/wkmKQtFNbdFQmt8Y0OfWUCOVMlXcctEld/ZY2hp9+m
+6qa5qP7SOLxjKfsDzRMmjaYLqIdh/CmkcMnljq591xptl4UhAE/L6qU3+Rn3dMVz
+vVA8cxG+izTR+eLtHEZuAoDhpuxj6tg2NGpDp3fTnIrjz3tXkgwGNZVUZgEOpob5
+oRHPnSKfLPV5R3DSihU7DBKVKWbjzWkdaSpSMtQz3wcCAwEAAaM9MDswGgYDVR0R
+BBMwEYIPd2ViNy51c2VyLmtpLnNlMB0GA1UdDgQWBBTdpO77hxYMVQUhBb8p6V1q
+29CMtDANBgkqhkiG9w0BAQUFAAOCAQEAPkhXjpUsUR32s6ziQtQsZJ6T1E5LI+2c
+nLi8xZmMZRqc8Bn6UMn74ayI3B9RLeA7cwYSSzIJYqJs1tQe/Et6EshuGlRL4CjU
+or01UYQL3r5+GeVYBPU+GrBAZqLz/CnMBu0pBXKuiSxlBu0IT5e5dS54N+TiCMAC
+9y9G1GDqMHA6vCy4rHD8enKDoucyMXh43YZfoqrPG1/hF94SeDkp7LbPhuu5YjdR
+0KSf0LzAADlPrxE3n+IvmsdrqHsKGVuanESe9FM1+gO4vz5M3oG7TJQO0sQTDTX6
+hB/xlvDdoQcASSSvk8V6v/e4ePhRMZd2xCllj9uKAr604dazqtRGyg==
+</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://kisetest2.user.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kisetest2.user.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>