From 90b9b01efd5ad628d5d986461caad0a7380a8fe8 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 2 Feb 2016 16:41:04 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../o-las.net-simplesaml.xml                       | 63 +++++++++++-----------
 1 file changed, 30 insertions(+), 33 deletions(-)

(limited to 'swamid-interfederations-2.0/o-las.net-simplesaml.xml')

diff --git a/swamid-interfederations-2.0/o-las.net-simplesaml.xml b/swamid-interfederations-2.0/o-las.net-simplesaml.xml
index 163fb55d..1d48f1ce 100644
--- a/swamid-interfederations-2.0/o-las.net-simplesaml.xml
+++ b/swamid-interfederations-2.0/o-las.net-simplesaml.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://o-las.net/simplesaml">
-  <!--
-		This is a simpleSAMLphp SP for RiskWize Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://o-las.net/simplesaml">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-15T15:01:20Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -39,8 +36,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -72,26 +69,26 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RiskWize Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">O-LAS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.essentialskillz.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Marek</GivenName>
-    <SurName>Zapach</SurName>
-    <EmailAddress>mailto:marek@essentialskillz.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marek</GivenName>
-    <SurName>Zapach</SurName>
-    <EmailAddress>mailto:marek@essentialskillz.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RiskWize Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">O-LAS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.essentialskillz.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marek</md:GivenName>
+    <md:SurName>Zapach</md:SurName>
+    <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marek</md:GivenName>
+    <md:SurName>Zapach</md:SurName>
+    <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3