From 376f39703abf69cb49e8abeb272867d739685f0c Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 8 Jun 2016 14:55:06 +0200
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 swamid-interfederations-2.0/gidp.geant.net.xml | 59 ++++++++++++++------------
 1 file changed, 31 insertions(+), 28 deletions(-)

(limited to 'swamid-interfederations-2.0/gidp.geant.net.xml')

diff --git a/swamid-interfederations-2.0/gidp.geant.net.xml b/swamid-interfederations-2.0/gidp.geant.net.xml
index 225f8050..71932963 100644
--- a/swamid-interfederations-2.0/gidp.geant.net.xml
+++ b/swamid-interfederations-2.0/gidp.geant.net.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net">
+  <!--
+		This is a "GÉANT Guest Identity Provider" simpleSAMLphp IdP for GÉANT Limited.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:50:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gidp.geant.net</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">GÉANT Guest Identity Provider</mdui:DisplayName>
         <mdui:Logo height="69" width="199">https://www.edugain.org/GIdP.png</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -45,8 +48,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -78,22 +81,22 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
-    <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://gidp.geant.net/simplesamlphp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GÉANT Guest Identity Provider</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>eduGAIN OT</md:GivenName>
-    <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduGAIN OT</md:GivenName>
-    <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
+    <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://gidp.geant.net/simplesamlphp/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">GÉANT Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GÉANT Guest Identity Provider</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>eduGAIN OT</GivenName>
+    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>eduGAIN OT</GivenName>
+    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
-- 
cgit v1.2.3