resolve conflicts and merge

1 files changed, 69 insertions, 0 deletions

diff --git a/swamid-2.0/daisy.ict.kth.se-shibboleth.xml b/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
new file mode 100644
index 00000000..1496fb03
--- /dev/null
+++ b/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://daisy.ict.kth.se/shibboleth">
+  <md:Extensions>
+    <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://daisy.ict.kth.se/Shibboleth.sso/Login"/>
+      <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://daisy.ict.kth.se/Shibboleth.sso/Login/SU"/>
+      <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://daisy.ict.kth.se/Shibboleth.sso/DS/DSV"/>
+      <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://daisy.ict.kth.se/Shibboleth.sso/DS/DSV" index="1"/>
+      <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://daisy.ict.kth.se/Shibboleth.sso/DS/SU"/>
+      <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://daisy.ict.kth.se/Shibboleth.sso/DS/SU" index="2"/>
+      <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://daisy.ict.kth.se/Shibboleth.sso/DS/SWAMID"/>
+      <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://daisy.ict.kth.se/Shibboleth.sso/DS/SWAMID" index="3"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Daisy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Daisy</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Studieadministrativt system för data- och systemvetenskap vid Stockholms universitet och ICT-skolan vid KTH.</mdui:Description>
+        <mdui:Description xml:lang="en">Administrative system for education used by the Department of Computer and Systems Sciences (DSV) at Stockholm University and the School of Information and Communication Technology (ICT) at KTH.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>daisy.dsv.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=daisy.dsv.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANH4LV/rSc9DMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2RhaXN5LmRzdi5zdS5zZTAeFw0xNDA5MDIxMTM0MzdaFw0yNDA4MzAxMTM0
+MzdaMBoxGDAWBgNVBAMTD2RhaXN5LmRzdi5zdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMYxuWKcPXDRuanmNtBs0LlEdh8z5Dx/x1w6ZxmlfI7n
+Ed8pZbNwQXh8Ve8oa+zE5h5ucUQaH4IXn/dggbhnX6YbtI6uY5nti7gcFCivDxJ0
+5QM4BkRJlpCDX9neSehXJD/qXEhClSVMbr97nW0tG9MZcQf/PpnMqpfEOFTdzewX
+0JrNTUQWqseTYgJ4FIyjXL1juz6UwmBI+0Dmm7qQbg9dqqTLE9eImUPgATr+HIeY
+RPhIMFAyDxHDTsRaots8zx8KqjEUxmpI1dwCflPEJRxTe1dy+o/A00qUKrBWNdVN
+V0jahE0vSuHnpxskB5f9ZcMiUgwf84/qyKTGefoiomkCAwEAAaM9MDswGgYDVR0R
+BBMwEYIPZGFpc3kuZHN2LnN1LnNlMB0GA1UdDgQWBBS9Ss3+oqLHzza+tYncMvHI
+DfBVUzANBgkqhkiG9w0BAQUFAAOCAQEAHSqZjB17aP2sDkSEfqSbui2yMXwPcZSW
+2kKR6hZv1r7HnHDoGJYRmj7/qjVnaWJxSwZkeUvDykZpl1Vn42Ik0UgtipZ245Si
+SHhrmDQo9lpms1YwVFyHXamSU/6zbG0W/sTpcM5FB3hqUgWOLkO+bRutZZKE8T9N
++T0zv7S1FTWBttLA6iYOd/ODVe+Px2UMbadlk4iGZHZUI/4T4aRcNUInNhEdYXDK
+AA4QdpJkL9NWpra1nc5H/Z+Xs+KwciCDhmuu+QGwuynKuoJwSxRnlsGBar9K/5ra
+QhkStwIG6VXQAVJpMKGblsSIk+TqRD1okkUSY5BHAob80RAoOCmbhw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>