git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@108 0878fbc5-a6f2-46f6-b174-cb7b08c221d1

3 files changed, 98 insertions, 4 deletions

diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
index ea1549a8..4fa045a1 100644
--- a/nya-1.0-testing.mxml
+++ b/nya-1.0-testing.mxml
@@ -10,4 +10,5 @@
   <xi:include href="nya-workshop/bauta.umdc.umu.se.xml"/>
   <xi:include href="nya-workshop/swamid.wayf.ruc.dk.xml"/>
   <xi:include href="nya-workshop/users.hv.se.xml"/>
+  <xi:include href="nya-workshop/130-229-17-24-dhcp.ap-wlan.ki.se.xml"/>
 </EntitiesDescriptor>
diff --git a/nya-workshop/130-229-17-24-dhcp.ap-wlan.ki.se.xml b/nya-workshop/130-229-17-24-dhcp.ap-wlan.ki.se.xml
new file mode 100644
index 00000000..c8512e38
--- /dev/null
+++ b/nya-workshop/130-229-17-24-dhcp.ap-wlan.ki.se.xml
@@ -0,0 +1,78 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://130-229-17-24-dhcp.ap-wlan.ki.se">
+
+  <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>130-229-17-24-dhcp.ap-wlan.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=130-229-17-24-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAP0VioChKmy6MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+BAMTIDEzMC0yMjktMTctMjQtZGhjcC5hcC13bGFuLmtpLnNlMB4XDTA5MDQyMTEx
+NDM0MloXDTE5MDQxOTExNDM0MlowKzEpMCcGA1UEAxMgMTMwLTIyOS0xNy0yNC1k
+aGNwLmFwLXdsYW4ua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC4HP9TCvzT5KNSwPoQzzMlLQKPDtV8msYeZ5u0w5WdyS1K/r7xJvbVP31WOPXL
+8aHiyDh421Nep35Gnje6ct53T6yOaKDk5NT/UF7fT0xZ5MqKSsRaRxc9okiK/q6X
+jpO5Amf3DvvLst49MSaM+wQivaK7gU84bmo3QtdZJErQmtBz6ezWPh3kCLXLD7Fb
+9qb2QKa0ZM4FMmClMGmP+klIluSZThXTG7ziQyoEgeslVGs8AxFEWZsGpLJQKFWj
+Y/LXaMyNTTT0+WE9e+Q/y6zMjSKeWHrHP20gY/5O2+cECarQDHDcml0Sjw7z89yW
+sPFviR2JsGr9Uyc9pi6t6WgDAgMBAAGjcDBuME0GA1UdEQRGMESCIDEzMC0yMjkt
+MTctMjQtZGhjcC5hcC13bGFuLmtpLnNlhiAxMzAtMjI5LTE3LTI0LWRoY3AuYXAt
+d2xhbi5raS5zZTAdBgNVHQ4EFgQUoouRu3hmBYVFRonbl3BJXExFenMwDQYJKoZI
+hvcNAQEFBQADggEBALCsjdAzOnzrMwUejv848Xy5J43oHvaVlFfocftCGJ7qOoa1
+t/w2bCe+5o1oWiOdCwWDl2cq0CrgFPgKrUjdcaJO1hslqws4pUI5nOgX1++TkhF7
+ZaP9u22HfHPX9d6M35WrqH8CLDq2T7+gOEw4uQUZ7fqn3cJF82nKHBtHtQ9uLs81
+MtYBMukipyZxrPk/ZjF9m7Yp6g8TrMmtRaZlUscBg5PutG/xjxuL26+b50Y9gAR0
+Ye6lECzHP+/VVPj5w+s0XsoE7A0mUYjVmxm2x/AaeaSHAerz9qiKeGGn+qq+eyUI
+d9QDCTffXoyyhvok8TXet8iStYvz6FAGxtgjYq0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>130-229-17-24-dhcp.ap-wlan.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=130-229-17-24-dhcp.ap-wlan.ki.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAP0VioChKmy6MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+BAMTIDEzMC0yMjktMTctMjQtZGhjcC5hcC13bGFuLmtpLnNlMB4XDTA5MDQyMTEx
+NDM0MloXDTE5MDQxOTExNDM0MlowKzEpMCcGA1UEAxMgMTMwLTIyOS0xNy0yNC1k
+aGNwLmFwLXdsYW4ua2kuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC4HP9TCvzT5KNSwPoQzzMlLQKPDtV8msYeZ5u0w5WdyS1K/r7xJvbVP31WOPXL
+8aHiyDh421Nep35Gnje6ct53T6yOaKDk5NT/UF7fT0xZ5MqKSsRaRxc9okiK/q6X
+jpO5Amf3DvvLst49MSaM+wQivaK7gU84bmo3QtdZJErQmtBz6ezWPh3kCLXLD7Fb
+9qb2QKa0ZM4FMmClMGmP+klIluSZThXTG7ziQyoEgeslVGs8AxFEWZsGpLJQKFWj
+Y/LXaMyNTTT0+WE9e+Q/y6zMjSKeWHrHP20gY/5O2+cECarQDHDcml0Sjw7z89yW
+sPFviR2JsGr9Uyc9pi6t6WgDAgMBAAGjcDBuME0GA1UdEQRGMESCIDEzMC0yMjkt
+MTctMjQtZGhjcC5hcC13bGFuLmtpLnNlhiAxMzAtMjI5LTE3LTI0LWRoY3AuYXAt
+d2xhbi5raS5zZTAdBgNVHQ4EFgQUoouRu3hmBYVFRonbl3BJXExFenMwDQYJKoZI
+hvcNAQEFBQADggEBALCsjdAzOnzrMwUejv848Xy5J43oHvaVlFfocftCGJ7qOoa1
+t/w2bCe+5o1oWiOdCwWDl2cq0CrgFPgKrUjdcaJO1hslqws4pUI5nOgX1++TkhF7
+ZaP9u22HfHPX9d6M35WrqH8CLDq2T7+gOEw4uQUZ7fqn3cJF82nKHBtHtQ9uLs81
+MtYBMukipyZxrPk/ZjF9m7Yp6g8TrMmtRaZlUscBg5PutG/xjxuL26+b50Y9gAR0
+Ye6lECzHP+/VVPj5w+s0XsoE7A0mUYjVmxm2x/AaeaSHAerz9qiKeGGn+qq+eyUI
+d9QDCTffXoyyhvok8TXet8iStYvz6FAGxtgjYq0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://130-229-17-24-dhcp.ap-wlan.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/nya-workshop/swamid.wayf.ruc.dk.xml b/nya-workshop/swamid.wayf.ruc.dk.xml
index 72cad091..87764f26 100644
--- a/nya-workshop/swamid.wayf.ruc.dk.xml
+++ b/nya-workshop/swamid.wayf.ruc.dk.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.wayf.ruc.dk/swamid/shib13/sp/metadata.php">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.wayf.ruc.dk/swamid">
+  <SPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <AssertionConsumerService index="0" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swamid.wayf.ruc.dk/swamid/shib13/sp/AssertionConsumerService.php"/>
   </SPSSODescriptor>
   <ContactPerson contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>na@example.org</EmailAddress>
+    <GivenName>Mads</GivenName>
+    <SurName>Freek</SurName>
+    <EmailAddress>freek@ruc.dk</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>