resolve conflicts and merge

1 files changed, 93 insertions, 0 deletions

diff --git a/swamid-2.0/lms.hig.se-shibboleth-sp.xml b/swamid-2.0/lms.hig.se-shibboleth-sp.xml
new file mode 100644
index 00000000..0eb10cb4
--- /dev/null
+++ b/swamid-2.0/lms.hig.se-shibboleth-sp.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lms.hig.se/shibboleth-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#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: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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Blackboard (Learning Management System)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Blackboard lärplattform</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Blackboard is a web based learning management system, for courses at the University of Gävle. The system is used for both campus courses and distance learning. </mdui:Description>
+        <mdui:Description xml:lang="sv">Blackboard är ett webbaserat system för hantering av kurser vid Högskolan i Gävle, en så kallad lärplattform. Systemet kan användas för både campus- och distanskurser.</mdui:Description>
+        <mdui:Logo height="45" width="50">https://webkonto.student.hig.se/img/cencolor-50.gif</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="44" width="50">https://webkonto.student.hig.se/img/cenfarg-50.gif</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.blackboard.com/Footer/Privacy-Center.aspx</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <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://lms.hig.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://lms.hig.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>fgprd-137892-sf108273-app001</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=fgprd-137892-sf108273-app001</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAJjJj09+G/e9MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGZncHJkLTEzNzg5Mi1zZjEwODI3My1hcHAwMDEwHhcNMTUwNDIwMTYwMzE3
+WhcNMjUwNDE3MTYwMzE3WjAnMSUwIwYDVQQDExxmZ3ByZC0xMzc4OTItc2YxMDgy
+NzMtYXBwMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuCKelXjL
+3oStYmCPuLadSQ9VoUVsoUDVvG/KZMyqGffZFnecykjIR98UrmfP0HyTVSJKrTyZ
+oRMKgs+lLFFO6VXlBz8psHBjLbF/ZUk3Vz361iU1eWK9TZ2I0zQT+DEYqGY2iYGf
+QDM3tpzuuqm9cez/XlGINZK5Yxzt31+JirDTx5BwGgkTqNl34WO4LWcGSybMrIcM
+1kHqQ1j2vWe5/1QBVskIABEtZK3m798XcLAaGPvyFxl9iO9aBbpXGIyR9F0t2row
+lPAsEXkJ1pli/aLSq2EaGdXd+jHm9avhzvqqd1EgB8W4rbk99znNhOAOR8tBV8G5
+pC4gPZFmXTNi4wIDAQABo0owSDAnBgNVHREEIDAeghxmZ3ByZC0xMzc4OTItc2Yx
+MDgyNzMtYXBwMDAxMB0GA1UdDgQWBBT97eKp2I/NaaU7VpgTGmVhNQTsmDANBgkq
+hkiG9w0BAQUFAAOCAQEAPzOmg2K4XVoCrfGgaLk911O0Ok0aIs99HdBZ00Z1/7Qo
+qSZhZwas6HZdxkx2KA/RLztfbE71V33RVYlOhtH47lGLCvaEd5bsrrDeVnXsxPVS
+Nzdp17br+kLxyTqwSG2rvMVwHjFuDBS1Ar/Admm+k5Szj6UfuPBBIXDw8F33GwOT
+hzAuvpNmZKE5MpDOE97gtvAKAfPzL/St1off5DiCc1fC/AIYusUtcxh9hGdIZ5X8
+Lk4WW3xh7ISn0oT7Dd4ySiBaxYc1XWalRa082HDRHKW0xHZC+yywn+yiloN+t3sj
+Xiuyn7D35GBAgkGy+kU+hqB2fHQUrvnx3tn6wfL7BA==
+</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://lms.hig.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lms.hig.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lms.hig.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lms.hig.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lms.hig.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lms.hig.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lms.hig.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lms.hig.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lms.hig.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lms.hig.se/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lms.hig.se/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>