resolve conflicts and merge

1 files changed, 79 insertions, 0 deletions

diff --git a/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..f1077ee4
--- /dev/null
+++ b/swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml
@@ -0,0 +1,79 @@
+<?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://testgih.pingpong.net/Shibboleth.sso/Metadata">
+  <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"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TEST-PING PONG vid GIH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TEST-PING PONG at GIH</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">test: Lärplattformen PING PONG vid Gymnastik- och idrottshögskolan.</mdui:Description>
+        <mdui:Description xml:lang="en">test: The learning platform PING PONG at The Swedish School of Sport and Health Sciences.</mdui:Description>
+        <mdui:Logo height="168" width="50">https://testgih.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://testgih.pingpong.net/login/pingpong-logo-16x16.png</mdui:Logo>
+      </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://testgih.pingpong.net/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>krusbar.pingpong.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=krusbar.pingpong.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMVvfL7J0nz+MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGtydXNiYXIucGluZ3BvbmcubmV0MB4XDTEyMDYyODE1MDYzMFoXDTIyMDYy
+NjE1MDYzMFowHzEdMBsGA1UEAxMUa3J1c2Jhci5waW5ncG9uZy5uZXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvh+Jg4oen/vUUGtx9eAaYY5rXtTFl
+1nMfq5x3XghdSV8uPg4bQ6VXw/9fZVTnAO3iFrF1LrfjuZWhZN2iL40nXfM1isSR
+mDZDF7CgqwsnoaVodgS/OyL9Q9iGOaXrM2lrN4ucuFAZcd3MUIrZjyBp3jtWkuTp
+T1VHnicxVWbT8VsjrWAdj1MUFv2IeWPP1it+4dwUDZrLqKhRWnFAo8zGHXiyO+aw
+U1Qb/52EShNykDHWBbtzgadLhPQzWQy5E457wvNVFbad0cc29vASufbIhzBGE/U3
+DdVI6jphpn5QMZfHhl9BLoqr9MJh1F1BRlL+HOcLXbQqg0JD/d1d7XAjAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGtydXNiYXIucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQd
+qBIVHafXKIz/Jr3tdLtcKbzR8zANBgkqhkiG9w0BAQUFAAOCAQEAKYOuyj800ABK
+R99elNxsDEddcjmIJQbO5tAosETGVlyqqdWL2D1rtSw0CTQiaba5Ae/TcgR/fnOv
+1g3uBZA26iQPbzsKGKYsB21aUEPJO0ZVhTdcid1tS672fOIZf1Y8+hmNh1psAurp
+DNOpoBNLoM8S8P95Q7hM6xLM76D1R61q4kO3np/YLYwNQSsHnHddu8/9oJu5j7oV
+KGPGrSczPfxG4plIUxm5tzNkHqNyYQttKrXGqdtCdkwjtYxS48G/ba1XkR/+baMf
+D8OuFV1n1oNCM9fqRzlCOyA7ISZyMlfiMCP3HXs53AcrRAnUKYwkP6Q4dIPS3C4Y
+LaCAPwuThQ==
+</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://testgih.pingpong.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testgih.pingpong.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgih.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>