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

1 files changed, 101 insertions, 98 deletions

diff --git a/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
index 12d28d69..4a7e426a 100644
--- a/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://devidp.nottingham.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Development" Shibboleth Test IdP for the University of Nottingham.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://devidp.nottingham.ac.uk/idp/shibboleth">
+  <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,110 +9,116 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-28T09:44:57Z">
       <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">nottingham.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>
-						MIIEqDCCA5CgAwIBAgIQIQ1rs9m1C2AoNe0z3fesqjANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMjAeFw0xNDEwMzEwMDAwMDBaFw0xNTEwMzEyMzU5NTlaMEUxITAfBgNVBAsT
-						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXZGV2aWRwLm5vdHRp
-						bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsTxKr
-						cTyAanJZyfCgwfEL39/arCojde/S4J+QXJa7CmMUmq6sxgHC4si6meAOKFzyW07H
-						2P/2F1HSZ2pX7TAcZV9W7lWL+fTD7BoPMHvBT5d9RpiU0tF3ZagNDGNnk4RdX4kC
-						13qmrv8gzhMyXvrc7r6E4d0td2J/iQrkw5hlLKL7OaqP7gckxkbN2DtVQXNn7HUE
-						GQtZvFURoGeATqZlOOYez6+h26gYk3ay1QTPMHYVG40XUy9/j2EF3m2zyFzUei4u
-						YCD5ZvWXJZEjqZ0hjA6yzRdvAmyZQ4DdfcXHYhuKlRwe380tXKW0HSh0rYVXuVvG
-						rZSC5YbcUwwrrqgfAgMBAAGjggFzMIIBbzAfBgNVHSMEGDAWgBRb0IocmjJb4LXd
-						llQb4YYosP22vTAdBgNVHQ4EFgQUuUOC7Vl12WJDMvG4oBhHeh/OxtcwDgYDVR0P
-						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xD
-						QTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51
-						c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6
-						Ly9vY3NwLnVzZXJ0cnVzdC5jb20wIgYDVR0RBBswGYIXZGV2aWRwLm5vdHRpbmdo
-						YW0uYWMudWswDQYJKoZIhvcNAQELBQADggEBADldm3QMEZof/isHRRXSw7tnKOHK
-						geH8zqcCXYYGIdUABnGtUew/iPn0lA54gfKsnF+apMHUvcYA4/FvSFEg7C8A8Zya
-						BcPakbJP2NkV2VCpy2wGVo2pYIpm9jZLsZdFoI4NsRlSm4//hflxkBMJkYI0wfut
-						NfElPVdrZunLvBrMKc046ehphPbb55jy3uEUfC4kP+/E8rof90uU6j5aVSXESjGm
-						tpv40MnM4G0vOGHGXDd4kMAMAkmYEN88r4pV3Y10o9ZUhcyB0o0vPCYjSNOf8GGq
-						O0clm/8A13wY2x0gBIA6Lbs2XDEH0g4VU7LGnScQk5JPkTodVHlEpzq2meA=
+						MIIFHTCCBAWgAwIBAgIUVWaRBt31WzOx7eBc5uO9LbOj6HcwDQYJKoZIhvcNAQEL
+						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MTAwMjE0MDUz
+						MFoXDTE4MTAwMjE0MDUyNlowgaQxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0
+						aW5naGFtc2hpcmUxEzARBgNVBAcTCk5PVFRJTkdIQU0xJTAjBgNVBAoTHFRoZSBV
+						bml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNl
+						cnZpY2VzMSAwHgYDVQQDExdkZXZpZHAubm90dGluZ2hhbS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBANu7t+BK+ACukk0b2EqIeCrQzXbnT5Ld
+						Q9v7vhTgGEsCxhDiCb+mzeFKAOvClccwebopb/hrIvAcuxOZFqcZsJzOxRvEkzqz
+						CwroJZFX7Iri1aUrHEar8YNKMaj/ykf7kIUF005rYGjTBP6afhodmFNrFHSbTM7j
+						SEq/g5CzpMZgTNrcBr3/YBXS1rILxHtSnejAyDhNCbcVekOHuDsW5sljnqnEP16h
+						xCBBRUM4M9u97rCobu08cYgIWJvxN1dmYwv+XTu3jdENDTGl3qmgUH64U3KxSfTg
+						yvn7WWQkTOjOchoRhVe5Yg1/sE+88YbwVIot6IE1OIpDUpjYkC5PSRMCAwEAAaOC
+						AZswggGXMHMGCCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3Au
+						cXVvdmFkaXNnbG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVv
+						dmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF2RldmlkcC5u
+						b3R0aW5naGFtLmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYI
+						KwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRv
+						cnkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAfBgNVHSMEGDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+g
+						LaArhilodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAd
+						BgNVHQ4EFgQUwllUoHUTVJVKmTDTgYvAUR6CUHcwDQYJKoZIhvcNAQELBQADggEB
+						AB8WXSjEelZdwrogl2Wxz8d6lPfR7YLJhM4J/Ke7vPybMpqbclPFwTw+ZROf9Gfe
+						VnB33l1N1Gp5yS/NdG93OrSTJ7QP39FtApaOw1xGEh3SIy0mtnzhy1wWetJeiRtu
+						fnsLqfc9n51rPqqCxQgLbcSeRmU697I3rwQbCUEXExFIF7rXSIgetFHvYjU8fdiO
+						xS+S/JVjTnTKVkAnCfeBIfCY+B+Wx0SLz1PrrpM5XmnFlfYVrhjlIPuBqOSEio3K
+						nPQFe8hVXSsrSoWOR7US6M4GYK1XtBsPBsBO9QR27jY9Xw2bdjNLonnBUUcOPnmh
+						TBAy+XEEYVwucpdUuskTUvY=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.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://devidp.nottingham.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devidp.nottingham.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://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.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://devidp.nottingham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.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://devidp.nottingham.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devidp.nottingham.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">nottingham.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>
-						MIIEqDCCA5CgAwIBAgIQIQ1rs9m1C2AoNe0z3fesqjANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMjAeFw0xNDEwMzEwMDAwMDBaFw0xNTEwMzEyMzU5NTlaMEUxITAfBgNVBAsT
-						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXZGV2aWRwLm5vdHRp
-						bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsTxKr
-						cTyAanJZyfCgwfEL39/arCojde/S4J+QXJa7CmMUmq6sxgHC4si6meAOKFzyW07H
-						2P/2F1HSZ2pX7TAcZV9W7lWL+fTD7BoPMHvBT5d9RpiU0tF3ZagNDGNnk4RdX4kC
-						13qmrv8gzhMyXvrc7r6E4d0td2J/iQrkw5hlLKL7OaqP7gckxkbN2DtVQXNn7HUE
-						GQtZvFURoGeATqZlOOYez6+h26gYk3ay1QTPMHYVG40XUy9/j2EF3m2zyFzUei4u
-						YCD5ZvWXJZEjqZ0hjA6yzRdvAmyZQ4DdfcXHYhuKlRwe380tXKW0HSh0rYVXuVvG
-						rZSC5YbcUwwrrqgfAgMBAAGjggFzMIIBbzAfBgNVHSMEGDAWgBRb0IocmjJb4LXd
-						llQb4YYosP22vTAdBgNVHQ4EFgQUuUOC7Vl12WJDMvG4oBhHeh/OxtcwDgYDVR0P
-						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xD
-						QTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51
-						c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6
-						Ly9vY3NwLnVzZXJ0cnVzdC5jb20wIgYDVR0RBBswGYIXZGV2aWRwLm5vdHRpbmdo
-						YW0uYWMudWswDQYJKoZIhvcNAQELBQADggEBADldm3QMEZof/isHRRXSw7tnKOHK
-						geH8zqcCXYYGIdUABnGtUew/iPn0lA54gfKsnF+apMHUvcYA4/FvSFEg7C8A8Zya
-						BcPakbJP2NkV2VCpy2wGVo2pYIpm9jZLsZdFoI4NsRlSm4//hflxkBMJkYI0wfut
-						NfElPVdrZunLvBrMKc046ehphPbb55jy3uEUfC4kP+/E8rof90uU6j5aVSXESjGm
-						tpv40MnM4G0vOGHGXDd4kMAMAkmYEN88r4pV3Y10o9ZUhcyB0o0vPCYjSNOf8GGq
-						O0clm/8A13wY2x0gBIA6Lbs2XDEH0g4VU7LGnScQk5JPkTodVHlEpzq2meA=
+						MIIFHTCCBAWgAwIBAgIUVWaRBt31WzOx7eBc5uO9LbOj6HcwDQYJKoZIhvcNAQEL
+						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MTAwMjE0MDUz
+						MFoXDTE4MTAwMjE0MDUyNlowgaQxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0
+						aW5naGFtc2hpcmUxEzARBgNVBAcTCk5PVFRJTkdIQU0xJTAjBgNVBAoTHFRoZSBV
+						bml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNl
+						cnZpY2VzMSAwHgYDVQQDExdkZXZpZHAubm90dGluZ2hhbS5hYy51azCCASIwDQYJ
+						KoZIhvcNAQEBBQADggEPADCCAQoCggEBANu7t+BK+ACukk0b2EqIeCrQzXbnT5Ld
+						Q9v7vhTgGEsCxhDiCb+mzeFKAOvClccwebopb/hrIvAcuxOZFqcZsJzOxRvEkzqz
+						CwroJZFX7Iri1aUrHEar8YNKMaj/ykf7kIUF005rYGjTBP6afhodmFNrFHSbTM7j
+						SEq/g5CzpMZgTNrcBr3/YBXS1rILxHtSnejAyDhNCbcVekOHuDsW5sljnqnEP16h
+						xCBBRUM4M9u97rCobu08cYgIWJvxN1dmYwv+XTu3jdENDTGl3qmgUH64U3KxSfTg
+						yvn7WWQkTOjOchoRhVe5Yg1/sE+88YbwVIot6IE1OIpDUpjYkC5PSRMCAwEAAaOC
+						AZswggGXMHMGCCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3Au
+						cXVvdmFkaXNnbG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVv
+						dmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3J0MCIGA1UdEQQbMBmCF2RldmlkcC5u
+						b3R0aW5naGFtLmFjLnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYI
+						KwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRv
+						cnkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+						AjAfBgNVHSMEGDAWgBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+g
+						LaArhilodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAd
+						BgNVHQ4EFgQUwllUoHUTVJVKmTDTgYvAUR6CUHcwDQYJKoZIhvcNAQELBQADggEB
+						AB8WXSjEelZdwrogl2Wxz8d6lPfR7YLJhM4J/Ke7vPybMpqbclPFwTw+ZROf9Gfe
+						VnB33l1N1Gp5yS/NdG93OrSTJ7QP39FtApaOw1xGEh3SIy0mtnzhy1wWetJeiRtu
+						fnsLqfc9n51rPqqCxQgLbcSeRmU697I3rwQbCUEXExFIF7rXSIgetFHvYjU8fdiO
+						xS+S/JVjTnTKVkAnCfeBIfCY+B+Wx0SLz1PrrpM5XmnFlfYVrhjlIPuBqOSEio3K
+						nPQFe8hVXSsrSoWOR7US6M4GYK1XtBsPBsBO9QR27jY9Xw2bdjNLonnBUUcOPnmh
+						TBAy+XEEYVwucpdUuskTUvY=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.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">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Nottingham : Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University of Nottingham IT Helpline</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.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">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nottingham : Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University of Nottingham IT Helpline</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Betts</md:SurName>
+    <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>