http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 53 insertions, 120 deletions

diff --git a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
index c5c594d1..5b3ad941 100644
--- a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
@@ -1,50 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.richuish.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Richard Huish College.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.richuish.ac.uk/idp/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-17T13:52:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richuish.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcTCCA1mgAwIBAgIQOK05z/jgLpm7t1J1gbk9JzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxMjAwMDAwMFoXDTE2MDQxMTIzNTk1OVowQDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAucmljaHVp
-						c2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc/+JhPJ6P
-						2RjvN7s7WlFfifcFU/bh9md3XhKI4TqBNPQc3xPaB1m9hJ09pPJqwW58yJTu0F8w
-						eh+0GDq/AEDPPMbWNSGC8hq9Ih4LdB2RdSg81Fl8clFqjNlO4lZjMTXuOVkFwOtm
-						e8gXIsNryCWL5gcuaHzD6AWkTOMVN66HwCuZ/JgFC1KE8b+28pbE0dVmQAD6k4RJ
-						F2RF/GUVV+RyNBiKGQj0STCJmz6wVEZpBw1hq2XxFfyBatk9ASYAAY7oLDNQNDpK
-						4CUSwevosmHPJV4tNvoGsACqMmUxZH/P/WSk20JCUWIiHCy3pdQMxfr1mrH0u1V8
-						KOvmYDdUK49xAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-						V0fqkOO57TAdBgNVHQ4EFgQUDot17IlAyyEIRz0G/r4/UTFoGb0wDgYDVR0PAQH/
-						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5yaWNodWlzaC5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAMDv9hIY0OHIXmIEhM40KM0I6LgJ4MQWLO+zH
-						GqiCVokJaAgVN6I7YYmXoZNdVT8ydDXBy3O++c2I79RuGHA3odevop+92VjY25yo
-						lCAhL+aIWy6AD1nzVYTT99qZdkgxCf3d1ryB/A8xhVpkUgSChwlviq09R17+ihYM
-						ZXeFk70BGXMnvbwuEi6fyB5xG1Ki+21ktQBRIaOhlXkPrDsAuUZeVnGZ1AhFvt/K
-						dPPwiuxkdI9aAXORj37yj0HZBCuO4SGnM0hwx5DzgiIzTv6BI7UKkr3rhbGUDPHB
-						0g92pSiGsoE2FzexcNmU7B4J5QH/+CQWTt5zLb6/X0jjC++7Kw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -69,53 +34,21 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richuish.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richuish.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richuish.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcTCCA1mgAwIBAgIQOK05z/jgLpm7t1J1gbk9JzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxMjAwMDAwMFoXDTE2MDQxMTIzNTk1OVowQDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAucmljaHVp
-						c2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc/+JhPJ6P
-						2RjvN7s7WlFfifcFU/bh9md3XhKI4TqBNPQc3xPaB1m9hJ09pPJqwW58yJTu0F8w
-						eh+0GDq/AEDPPMbWNSGC8hq9Ih4LdB2RdSg81Fl8clFqjNlO4lZjMTXuOVkFwOtm
-						e8gXIsNryCWL5gcuaHzD6AWkTOMVN66HwCuZ/JgFC1KE8b+28pbE0dVmQAD6k4RJ
-						F2RF/GUVV+RyNBiKGQj0STCJmz6wVEZpBw1hq2XxFfyBatk9ASYAAY7oLDNQNDpK
-						4CUSwevosmHPJV4tNvoGsACqMmUxZH/P/WSk20JCUWIiHCy3pdQMxfr1mrH0u1V8
-						KOvmYDdUK49xAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-						V0fqkOO57TAdBgNVHQ4EFgQUDot17IlAyyEIRz0G/r4/UTFoGb0wDgYDVR0PAQH/
-						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5yaWNodWlzaC5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAMDv9hIY0OHIXmIEhM40KM0I6LgJ4MQWLO+zH
-						GqiCVokJaAgVN6I7YYmXoZNdVT8ydDXBy3O++c2I79RuGHA3odevop+92VjY25yo
-						lCAhL+aIWy6AD1nzVYTT99qZdkgxCf3d1ryB/A8xhVpkUgSChwlviq09R17+ihYM
-						ZXeFk70BGXMnvbwuEi6fyB5xG1Ki+21ktQBRIaOhlXkPrDsAuUZeVnGZ1AhFvt/K
-						dPPwiuxkdI9aAXORj37yj0HZBCuO4SGnM0hwx5DzgiIzTv6BI7UKkr3rhbGUDPHB
-						0g92pSiGsoE2FzexcNmU7B4J5QH/+CQWTt5zLb6/X0jjC++7Kw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -140,35 +73,35 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Richard Huish College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Richard Huish College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.richuish.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:richarda@richuish.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Scott</GivenName>
-    <SurName>Upham</SurName>
-    <EmailAddress>mailto:scottu@richuish.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:richarda@richuish.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Upham</SurName>
-    <EmailAddress>mailto:scottu@richuish.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Richard Huish College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Richard Huish College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.richuish.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:richarda@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Upham</md:SurName>
+    <md:EmailAddress>mailto:scottu@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:richarda@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Upham</md:SurName>
+    <md:EmailAddress>mailto:scottu@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>