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

1 files changed, 177 insertions, 90 deletions

diff --git a/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml
index a3221f77..077dc951 100644
--- a/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-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://shib2.qmu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Queen Margaret University, Edinburgh.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.qmu.ac.uk/idp/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-04T12:46: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>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Queen Margaret University, Edinburgh</mdui:DisplayName>
         <mdui:Logo height="47" width="50">https://shib2.qmu.ac.uk/qmu_logo.gif</mdui:Logo>
@@ -24,98 +21,188 @@
         <mdui:GeolocationHint>geo:55.931696,-3.073457</mdui:GeolocationHint>
       </mdui:DiscoHints>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEHDCCAwSgAwIBAgIJALXqP3+WEFbxMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjEVMBMGA1UECBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxi
-						dXJnaDEiMCAGA1UEChMZUXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UE
-						CxMLSVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azAeFw0xNTAy
-						MDYxMzQ5MzlaFw0yNTAyMDMxMzQ5MzlaMIGOMQswCQYDVQQGEwJHQjEVMBMGA1UE
-						CBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxidXJnaDEiMCAGA1UEChMZ
-						UXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQgU2VydmljZXMx
-						GDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALZ45sT4BFzeyQq+7s+fB3MXY5DEJ7M5LqLwOuLQu9qQy8QXkfjl
-						IF/njXWdTISjaQduqpfxQ2s2math1WjYqw+ahbBo7pLMtJjUZaFuBu8SfWOvlAcj
-						nBmZGuo38oaKVi7F+cPEltwEyA4soxdjy+VnwIHlcmgapQf6/qu/zUwDzQpr+DjO
-						VXLc2E/F4ac6DdWaymQgCyuukR6nz8y690XurJmd9neaZGMjYRcM9MStHM6rNuRh
-						snpjcTgJ1LVtMeLHzp6F3AyEy10oRGmuehLNsG53jD8qyjVQgiN1BICaUBEwuz49
-						lB5IsP1LbP5ZaGx23w/gm/TndqTo3toThX8CAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFG+x6Z1HFy1EVNofQT5Pz5MbLFglMB8GA1UdIwQYMBaAFG+x6Z1HFy1E
-						VNofQT5Pz5MbLFglMA0GCSqGSIb3DQEBBQUAA4IBAQBu+SRFvMc99/KKW615vkO0
-						IZYqXVKtt13FjHOzNIm9Pb51dzOqEBVqSn4Hc0lhaL5Bat8t8JgDbKFd85H8v/oB
-						tM7XBK4bgQhyG4jd144SSwN1HLqWKdQE54w3MyWvFHrGrPAqjgqZMqGSCFpORlJG
-						rd2EC/yHEkOrY0X74q0uaU6D7Kp96Ayv5NtZWvCcj1hNdQF/CoX0vA+uFdYWWUEd
-						oiaa7CX11axaCto39+d4wwqSeX3j0YUkvkU+0spZeYstSA5PNX4G8drgxRGK3+uV
-						blLOGW/k9vBqR2M4FEIMjli/7ytkIVG6q0g1ENv3x89Q6y7pqzP/G1L4q0d0lkKq
+						MIIDIDCCAgigAwIBAgIVAJHckdGW1E6nDrwPcGkVRFgwIkLVMA0GCSqGSIb3DQEB
+						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUyWhcN
+						MzUwODI1MTMyNTUyWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJKUCoRpDd0DgKIvr1QyYsOCN6nxa60f
+						jNX+VVuYHdyZjQCf3sBa3C/NPOifPl8/nORvcQcW4LlUc9t21d7EgNcYYL9+nZ6B
+						kAlVHTmD0ssH4axtHbPwXnMgs60KnZ5TMPQkgERnTIehjPngxzy89sOGESZDcsQz
+						7c9thvLDLvOQwtb168FClmnMonZc2Ey1h5BfS5ZyxAfuckhoDL98iJFdPOW3yp8D
+						bDPKuPpuMcPl+M3pWHvCLkrkScgqRHypmxYwhMId2kDroJQiT3NXmQGvYzHBn3eo
+						Od9PlcJ+2YNyUXnfvgI/0Pv6m8KCRj107HsgVaYi8w1FtoK3Im7/cwIDAQABo2Ew
+						XzAdBgNVHQ4EFgQUdl+HXullkjaAS02+Es07DHWO230wPgYDVR0RBDcwNYINaWRw
+						LnFtdS5hYy51a4YkaHR0cHM6Ly9pZHAucW11LmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQBi0qp6mORG4KC3dI2HjH35OuHs1NjO44y0Lo76
+						BBDlDfrDxxMm0LniYXmmNVHIjhshDcnpMUPsyoDEE3wieLxwEp0QLmg44LYmB6YD
+						RF3hb3c3EtOs294StyzX3HBzmDbb0YfN6nhLMd2euOB3EYZpLoJzYoy1luIs/KQm
+						pX+c3pqWsgkqGHBd4s6G5DGb8krulZrK9VKXb1HGqqqY17lKwavAzqE06MzhFRRo
+						GgN5wDmdOa/5B1kzbZ9W6/3JbMd+sKVMS93O1zI8fG8DfLq+4g5f6RY23JbD76ss
+						gYK+Lt/CJr+Opa1+bBQrBwkJGoWP8EfuKDyVYj44Wvutm45J
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.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://shib2.qmu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.qmu.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:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIVAKQI4LOpTw+gfDcBaUDIhqnlSKnDMA0GCSqGSIb3DQEB
+						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUzWhcN
+						MzUwODI1MTMyNTUzWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2BfAJesvYBMEHgDojaV+sTJ1HbsCXYYy
+						HQeuctNHxMHROrO4dh9fPrILsNyX3u94ub+OZiV/GE5Tlb1rni09BCOWG4Svq1vR
+						YUaZC9FvQo+vMNPR86m6eJbnMDCvi2IOFKcGcdjQIGS2VfA6H0WwRPR3IRYqygOF
+						+KC/lKLcIyjlKCJB21k12GITnn1tsy6y0Ylg2Ets031eUhK5cpEMR70IVtnJSYyn
+						3yYtk8FA517oY/dUaWxCst45ZvU10e5/lue9DO+JVXLXYnr8c0t6bTebpaBXVCKF
+						mq2sGnoE2nSxMhF9vDx5Tw5QE3R7hwoW0z2s6lIiiD58JAjikkoR3wIDAQABo2Ew
+						XzAdBgNVHQ4EFgQUzWcVUZGHqt8uFsmoKsB0xxhz2cgwPgYDVR0RBDcwNYINaWRw
+						LnFtdS5hYy51a4YkaHR0cHM6Ly9pZHAucW11LmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQAPjIxhzi2FrZtkC734nd0tBZ0e8Alub1o7XMAK
+						NZbBZVAz4pfEIA55PhIS/a43SD6N46DPX/Ufx3AKZZEc7y16xnJTpIZczot9sAzw
+						HNQpneDehvS13eE7LPJ/XBND5Gwelz6rvX0dgsmA7SvNnHgp2yjVWyoswC99zf4U
+						UONrG0m1HRS8bILFSFYwAEsQbQxlZvRwApWKvUDIFmeBke5wuxCzb4dd/zK7H1X9
+						cjRpce3uDuOhKGQtmMHmig3dd72nJeHUoDY1QzQc4nw1IciJyJ6r3LzScy+GpSje
+						k4A44yA3kIp6HlqiHqF23koUpogpejP3TauQB3gGJQaVeLti
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDJzCCAg+gAwIBAgIURpdjTjwcGImbW/r7Ao0+z0pBc3IwDQYJKoZIhvcNAQEL
+						BQAwGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMB4XDTE2MDUxNjA5MzQwMloX
+						DTM2MDUxNjA5MzQwMlowGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAptC4qFIteMTaLiHY9aMpUEO2EZdr
+						AGe82sTZG/Mudo/nNuPqPoX59maIp0o83QSnHAI0TAxWMQQwwZOFrOL7trh3TZE8
+						he4aMmueIvEIC8HkOtuAqr+z352+qUxistR3xfTbfofK/LIwiQPoQCBy38MdY3Gn
+						BGFhb+TK5M8jsJ7SL2HoQWy9s31CDDDjS6RPPQF3apQlUY7YMh5JhLai/9GepM7f
+						/wSu2F7wlA/x2s4vgIq5HoMlf74bI7Xa3A5t8xiZQJ8vc+NXluuAJrIBnd6CWtPV
+						i98skKhGncCRPWl1t5y7hjy1QzrJMcdR4yZQ0lMm1UoS6GDWOJ2tYwYmDwIDAQAB
+						o2UwYzAdBgNVHQ4EFgQUqZBg7DZ61SjRSUgA2pE/FKhg/m8wQgYDVR0RBDswOYIP
+						c2hpYjIucW11LmFjLnVrhiZodHRwczovL3NoaWIyLnFtdS5hYy51ay9pZHAvc2hp
+						YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEARAbYSQ9AUY/B1JPMRycIggvIlqAf
+						fraN+Brp8GMLuYrkX0GIaMp3h5Uh2UM2ksRsci0eHS1jXNc1TAADr5ViKq1uDBgq
+						iHPHYUvSyJc7ib0RFzFzPo7E/Zj7vsnUag5vlCKd/gD2pQv6pjMTI784BYzk29wi
+						I7MfWhnEMnpzB/T0vOcEvZatXavP6XnGW0owvsuIK30V88j7d52CJSrj3IJFBfVy
+						z37vNMXQier73zDk2HVG5WcWiaES3PTfNl079s0nxaAM0rDPXj5oiz+f1R5qrRav
+						XO4oH51Nh8eXR90oA0t+1LhpLw5tCg5UNDCRJU3YcvxVXZf14DhcyQVZvg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.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://shib2.qmu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.qmu.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">qmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIVAJHckdGW1E6nDrwPcGkVRFgwIkLVMA0GCSqGSIb3DQEB
+						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUyWhcN
+						MzUwODI1MTMyNTUyWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJKUCoRpDd0DgKIvr1QyYsOCN6nxa60f
+						jNX+VVuYHdyZjQCf3sBa3C/NPOifPl8/nORvcQcW4LlUc9t21d7EgNcYYL9+nZ6B
+						kAlVHTmD0ssH4axtHbPwXnMgs60KnZ5TMPQkgERnTIehjPngxzy89sOGESZDcsQz
+						7c9thvLDLvOQwtb168FClmnMonZc2Ey1h5BfS5ZyxAfuckhoDL98iJFdPOW3yp8D
+						bDPKuPpuMcPl+M3pWHvCLkrkScgqRHypmxYwhMId2kDroJQiT3NXmQGvYzHBn3eo
+						Od9PlcJ+2YNyUXnfvgI/0Pv6m8KCRj107HsgVaYi8w1FtoK3Im7/cwIDAQABo2Ew
+						XzAdBgNVHQ4EFgQUdl+HXullkjaAS02+Es07DHWO230wPgYDVR0RBDcwNYINaWRw
+						LnFtdS5hYy51a4YkaHR0cHM6Ly9pZHAucW11LmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQBi0qp6mORG4KC3dI2HjH35OuHs1NjO44y0Lo76
+						BBDlDfrDxxMm0LniYXmmNVHIjhshDcnpMUPsyoDEE3wieLxwEp0QLmg44LYmB6YD
+						RF3hb3c3EtOs294StyzX3HBzmDbb0YfN6nhLMd2euOB3EYZpLoJzYoy1luIs/KQm
+						pX+c3pqWsgkqGHBd4s6G5DGb8krulZrK9VKXb1HGqqqY17lKwavAzqE06MzhFRRo
+						GgN5wDmdOa/5B1kzbZ9W6/3JbMd+sKVMS93O1zI8fG8DfLq+4g5f6RY23JbD76ss
+						gYK+Lt/CJr+Opa1+bBQrBwkJGoWP8EfuKDyVYj44Wvutm45J
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDIDCCAgigAwIBAgIVAKQI4LOpTw+gfDcBaUDIhqnlSKnDMA0GCSqGSIb3DQEB
+						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUzWhcN
+						MzUwODI1MTMyNTUzWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2BfAJesvYBMEHgDojaV+sTJ1HbsCXYYy
+						HQeuctNHxMHROrO4dh9fPrILsNyX3u94ub+OZiV/GE5Tlb1rni09BCOWG4Svq1vR
+						YUaZC9FvQo+vMNPR86m6eJbnMDCvi2IOFKcGcdjQIGS2VfA6H0WwRPR3IRYqygOF
+						+KC/lKLcIyjlKCJB21k12GITnn1tsy6y0Ylg2Ets031eUhK5cpEMR70IVtnJSYyn
+						3yYtk8FA517oY/dUaWxCst45ZvU10e5/lue9DO+JVXLXYnr8c0t6bTebpaBXVCKF
+						mq2sGnoE2nSxMhF9vDx5Tw5QE3R7hwoW0z2s6lIiiD58JAjikkoR3wIDAQABo2Ew
+						XzAdBgNVHQ4EFgQUzWcVUZGHqt8uFsmoKsB0xxhz2cgwPgYDVR0RBDcwNYINaWRw
+						LnFtdS5hYy51a4YkaHR0cHM6Ly9pZHAucW11LmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBCwUAA4IBAQAPjIxhzi2FrZtkC734nd0tBZ0e8Alub1o7XMAK
+						NZbBZVAz4pfEIA55PhIS/a43SD6N46DPX/Ufx3AKZZEc7y16xnJTpIZczot9sAzw
+						HNQpneDehvS13eE7LPJ/XBND5Gwelz6rvX0dgsmA7SvNnHgp2yjVWyoswC99zf4U
+						UONrG0m1HRS8bILFSFYwAEsQbQxlZvRwApWKvUDIFmeBke5wuxCzb4dd/zK7H1X9
+						cjRpce3uDuOhKGQtmMHmig3dd72nJeHUoDY1QzQc4nw1IciJyJ6r3LzScy+GpSje
+						k4A44yA3kIp6HlqiHqF23koUpogpejP3TauQB3gGJQaVeLti
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEHDCCAwSgAwIBAgIJALXqP3+WEFbxMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjEVMBMGA1UECBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxi
-						dXJnaDEiMCAGA1UEChMZUXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UE
-						CxMLSVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azAeFw0xNTAy
-						MDYxMzQ5MzlaFw0yNTAyMDMxMzQ5MzlaMIGOMQswCQYDVQQGEwJHQjEVMBMGA1UE
-						CBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxidXJnaDEiMCAGA1UEChMZ
-						UXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQgU2VydmljZXMx
-						GDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALZ45sT4BFzeyQq+7s+fB3MXY5DEJ7M5LqLwOuLQu9qQy8QXkfjl
-						IF/njXWdTISjaQduqpfxQ2s2math1WjYqw+ahbBo7pLMtJjUZaFuBu8SfWOvlAcj
-						nBmZGuo38oaKVi7F+cPEltwEyA4soxdjy+VnwIHlcmgapQf6/qu/zUwDzQpr+DjO
-						VXLc2E/F4ac6DdWaymQgCyuukR6nz8y690XurJmd9neaZGMjYRcM9MStHM6rNuRh
-						snpjcTgJ1LVtMeLHzp6F3AyEy10oRGmuehLNsG53jD8qyjVQgiN1BICaUBEwuz49
-						lB5IsP1LbP5ZaGx23w/gm/TndqTo3toThX8CAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFG+x6Z1HFy1EVNofQT5Pz5MbLFglMB8GA1UdIwQYMBaAFG+x6Z1HFy1E
-						VNofQT5Pz5MbLFglMA0GCSqGSIb3DQEBBQUAA4IBAQBu+SRFvMc99/KKW615vkO0
-						IZYqXVKtt13FjHOzNIm9Pb51dzOqEBVqSn4Hc0lhaL5Bat8t8JgDbKFd85H8v/oB
-						tM7XBK4bgQhyG4jd144SSwN1HLqWKdQE54w3MyWvFHrGrPAqjgqZMqGSCFpORlJG
-						rd2EC/yHEkOrY0X74q0uaU6D7Kp96Ayv5NtZWvCcj1hNdQF/CoX0vA+uFdYWWUEd
-						oiaa7CX11axaCto39+d4wwqSeX3j0YUkvkU+0spZeYstSA5PNX4G8drgxRGK3+uV
-						blLOGW/k9vBqR2M4FEIMjli/7ytkIVG6q0g1ENv3x89Q6y7pqzP/G1L4q0d0lkKq
+						MIIDJzCCAg+gAwIBAgIURpdjTjwcGImbW/r7Ao0+z0pBc3IwDQYJKoZIhvcNAQEL
+						BQAwGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMB4XDTE2MDUxNjA5MzQwMloX
+						DTM2MDUxNjA5MzQwMlowGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMIIBIjAN
+						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAptC4qFIteMTaLiHY9aMpUEO2EZdr
+						AGe82sTZG/Mudo/nNuPqPoX59maIp0o83QSnHAI0TAxWMQQwwZOFrOL7trh3TZE8
+						he4aMmueIvEIC8HkOtuAqr+z352+qUxistR3xfTbfofK/LIwiQPoQCBy38MdY3Gn
+						BGFhb+TK5M8jsJ7SL2HoQWy9s31CDDDjS6RPPQF3apQlUY7YMh5JhLai/9GepM7f
+						/wSu2F7wlA/x2s4vgIq5HoMlf74bI7Xa3A5t8xiZQJ8vc+NXluuAJrIBnd6CWtPV
+						i98skKhGncCRPWl1t5y7hjy1QzrJMcdR4yZQ0lMm1UoS6GDWOJ2tYwYmDwIDAQAB
+						o2UwYzAdBgNVHQ4EFgQUqZBg7DZ61SjRSUgA2pE/FKhg/m8wQgYDVR0RBDswOYIP
+						c2hpYjIucW11LmFjLnVrhiZodHRwczovL3NoaWIyLnFtdS5hYy51ay9pZHAvc2hp
+						YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEARAbYSQ9AUY/B1JPMRycIggvIlqAf
+						fraN+Brp8GMLuYrkX0GIaMp3h5Uh2UM2ksRsci0eHS1jXNc1TAADr5ViKq1uDBgq
+						iHPHYUvSyJc7ib0RFzFzPo7E/Zj7vsnUag5vlCKd/gD2pQv6pjMTI784BYzk29wi
+						I7MfWhnEMnpzB/T0vOcEvZatXavP6XnGW0owvsuIK30V88j7d52CJSrj3IJFBfVy
+						z37vNMXQier73zDk2HVG5WcWiaES3PTfNl079s0nxaAM0rDPXj5oiz+f1R5qrRav
+						XO4oH51Nh8eXR90oA0t+1LhpLw5tCg5UNDCRJU3YcvxVXZf14DhcyQVZvg==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.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">Queen Margaret University, Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Margaret University, Edinburgh</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Garry</GivenName>
-    <SurName>Haining</SurName>
-    <EmailAddress>mailto:ghaining@qmu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Garry</GivenName>
-    <SurName>Haining</SurName>
-    <EmailAddress>mailto:ghaining@qmu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.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">Queen Margaret University, Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Margaret University, Edinburgh</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Garry</md:GivenName>
+    <md:SurName>Haining</md:SurName>
+    <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Garry</md:GivenName>
+    <md:SurName>Haining</md:SurName>
+    <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>