Merge branch 'master' of md-master.swamid.se:swamid-metadata

Conflicts:
	swamid-sp-2.0.mxml

1 files changed, 74 insertions, 0 deletions

diff --git a/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..936b3f3f
--- /dev/null
+++ b/swamid-2.0/testgu.pingpong.net-shibboleth.sso-metadata.xml
@@ -0,0 +1,74 @@
+<?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://testgu.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-GUL, PING PONG vid Göteborgs universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TEST-GUL, PING PONG at Gothenburg university</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Test version of GUL, Lärplattformen PING PONG vid Göteborgs universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Test version of GUL, The learning platform PING PONG at Gothenburg university.</mdui:Description>
+        <mdui:Logo height="50" width="168">https://testgu.pingpong.net/login/pingpong-logo-168x50.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://testgu.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://testgu.pingpong.net/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>testgu.pingpong.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=testgu.pingpong.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAME2EogsaBsxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3Rlc3RndS5waW5ncG9uZy5uZXQwHhcNMTUwNzMxMDAxNjI1WhcNMjUwNzI4
+MDAxNjI1WjAeMRwwGgYDVQQDExN0ZXN0Z3UucGluZ3BvbmcubmV0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyYPbn4CeU3tNI/8FdjRRUJcTb/gG+g0j
+MvE2RPC//eJw/UR0IwFsJy1R7bwEHynfpwMck+0K9nxNUtp84kN//k86Oy2sQVey
+Ai0OCg5smTguBedA2n8lH7RDFkSvwtoASaGLSEoxXrE0nizDf3uWePLOqewzn5+o
+jXWTS4RhnU12mP+fDVcrO8SqGsbOBXh8AGuUkfLOeyOD9Ayc1rNR6+KuObFqs05q
+BKsy+klw3b1OKk5L2eRgcPlZpNzLIfwVPVpanjItgBdZ1crs58oFpKzarVodjDwY
+kozDsyFCczo/YAlovWq5bvGnkap2I3ltuLGN19GIFoABa8XIPhXtbQIDAQABo0Ew
+PzAeBgNVHREEFzAVghN0ZXN0Z3UucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQwKdDx
+5NCyLEP4EiCnI49AdPCJNTANBgkqhkiG9w0BAQUFAAOCAQEAMhDQdkJ+oFVKylVM
+LH9AlRmQlC0uqqaZfPECYwepQ08sAb1f6H3OGS8VfHB0PGrMlSgtu3mJImB3LZ+h
+Du69XL+oQV9qr4XNUYhUXAPXkbiojcUEy2WrJ2kEf3GrNomUm234fLu8WEhDV4iU
+l6EOZqEFS5sUtHpQEkW6ITn7MJH+/g412nbxtNRsVCbaEf8jX6n3qG93xyilOgJ3
+cpCuEjbgpDdWe3DPCrL9Kn4ab88aoblJVmjfH4t6t6TMc+zskhKXiQUGogGxzol3
+MSKIqXKgkSbbCtsduu3LvzmWV1r9U8J1QN7BSz7XBjqHvXgxDQzYMFr1SHtIKmN5
+v3gw1w==
+</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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testgu.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>