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

1 files changed, 46 insertions, 113 deletions

diff --git a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
index d75af343..7e1e1670 100644
--- a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.aber.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Aberystwyth University.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.aber.ac.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-08-08T07:11:05Z">
       <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">aber.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Aberystwyth University</mdui:DisplayName>
@@ -22,8 +19,8 @@
         <mdui:DomainHint>aber.ac.uk</mdui:DomainHint>
         <mdui:GeolocationHint>geo:52.41806,-4.06576</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -48,56 +45,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
-						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
-						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
-						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
-						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
-						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
-						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
-						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
-						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
-						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
-						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
-						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
-						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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://shibboleth.aber.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.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://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <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://shibboleth.aber.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.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">aber.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -122,57 +87,25 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
-						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
-						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
-						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
-						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
-						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
-						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
-						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
-						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
-						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
-						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
-						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
-						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.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">Aberystwyth University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aberystwyth University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aber.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information</GivenName>
-    <SurName>Services</SurName>
-    <EmailAddress>mailto:is@aber.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Wiles</SurName>
-    <EmailAddress>mailto:aew@aber.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.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">Aberystwyth University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aberystwyth University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aber.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information</md:GivenName>
+    <md:SurName>Services</md:SurName>
+    <md:EmailAddress>mailto:is@aber.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Wiles</md:SurName>
+    <md:EmailAddress>mailto:aew@aber.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>