From 54f80505cbaac150bd7414a7f8c45c5a7f336f50 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 16 Feb 2016 14:06:42 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../stsr4l.who.int-adfs-services-trust.xml         | 71 +++++++++++-----------
 1 file changed, 34 insertions(+), 37 deletions(-)

(limited to 'swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml')

diff --git a/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml b/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
index fc057ac3..7c474af7 100644
--- a/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://stsr4l.who.int/adfs/services/trust">
-  <!--
-		This is an ADFS 2 "Research4Life" IdP entity for the World Health Organisation.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://stsr4l.who.int/adfs/services/trust">
+  <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
@@ -12,12 +9,12 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T13:21:48Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">r4l.who.int</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -59,8 +56,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -102,28 +99,28 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">World Health Organisation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research4Life</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.research4life.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ged</GivenName>
-    <SurName>Cheng</SurName>
-    <EmailAddress>mailto:gedatwho@gmail.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ged</GivenName>
-    <SurName>Cheng</SurName>
-    <EmailAddress>mailto:gedatwho@gmail.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">World Health Organisation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research4Life</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.research4life.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ged</md:GivenName>
+    <md:SurName>Cheng</md:SurName>
+    <md:EmailAddress>mailto:gedatwho@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ged</md:GivenName>
+    <md:SurName>Cheng</md:SurName>
+    <md:EmailAddress>mailto:gedatwho@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3