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

1 files changed, 78 insertions, 185 deletions

diff --git a/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml
index 7528dc66..2d67a95e 100644
--- a/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/trshibtest.falmouth.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://trshibtest.falmouth.ac.uk/idp/shibboleth">
-  <!--
-		This is a test Shibboleth IdP for Falmouth University.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://trshibtest.falmouth.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,9 +9,9 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-24T16:06:57Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fxplus.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -22,196 +19,92 @@
         <mdui:Description xml:lang="en">Falmouth University &amp; FXPlus IdP</mdui:Description>
         <mdui:Logo height="80" width="80">https://trshibtest.falmouth.ac.uk/idp/images/falmouth-university-logo-print.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALdJ0CbH8jcGy4tEynFSTk1hpgN0MA0GCSqGSIb3DQEB
-						CwUAMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3QuZmFsbW91dGguYWMudWswHhcNMTYw
-						MzEwMTQxMjM3WhcNMzYwMzEwMTQxMjM3WjAkMSIwIAYDVQQDDBl0cnNoaWJ0ZXN0
+						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
+						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
 						LmZhbG1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						lFSN9874S8OSMzLJWs7ysZiQeyUhHBLpR3dRvTM6VmpP/r5k+pLdR/xCcjwMIP2v
-						sBDufMMHlbaFIZErS6J5mtlOmU2yYVsa3wvGqnMV0doX/LRPoYKKSJxIBgBoCx63
-						LXAS6l/ZBNuB8JjLYP9WEGda5JWNxE4iwFfFjcpLsqNljzcDHGzWzNC8tErKRZcz
-						Hj0ZgIfecO7gAQIdRKPo47qJ/ut4q9bplk+7MzfWJ8e3qQLetXw8yxlCse2johOy
-						DWNw7uduEwg7mQncUUTdO/m5VHwm0UGhozMf1bw837fdX0IZjGzZ5noQ3TfrDSQg
-						MImungTTMnMB4o9duqEV9QIDAQABo3kwdzAdBgNVHQ4EFgQUvUB+7I6pLrZfc0Xa
-						ozHOnzMbiCQwVgYDVR0RBE8wTYIZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51a4Yw
-						aHR0cHM6Ly90cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBCwUAA4IBAQAqhAE9QU4GG1vQUGbQaBFiggrrNQPaSe+J2dTg
-						7YieVe3dOf5AqcbYdMmFXuUvKGQoXRDlnvbDQDxRi9dtUsADFnc8/UtWF/eMSu/X
-						BOnhH2rdhvLFuxW2avNf8YAXxtqqp5GA+vwNl2/Gv2TtfSpDeXrIdcIQpO0gbTXK
-						UE1hJDOyv92s8yVzYOv9aHgdoT1AAy884K7ymWByZ6v05kAnfwqcuMxm8uG1yP08
-						ujQvJ+CUe/bMSrQNl4U/Z4DuRckI6qDvPfKyRR9hTRHS7uTksPODDyB/gykaLY0N
-						vl+qFY7UB/E826CYYavCmzHYeMyzopHS/uFOIJ/fNLcmnzde
+						htyRP37lfHCQSvTtB09QGwRMXaHxV0KcAyDm2haJWRVnS/Q2nCXkDH4N0l3nsb8S
+						ibeizS3gnWkJM52C4VXm1Dn/4jZEu0tT/yrjfz4LOWx6pPluUg29euLr7ICLdPAv
+						fjH0iQ4Ah2mVc0iEwtFhrnDCV1uGPgxsu8DpiV0TrpoqTlEIzcB9z6Y4ha7yuZ2j
+						p0SP1piRoFBoeXeRDJ3D4Lprw8YV1ZKLOZaeyI8n8KIwspLZLcAqIkGoJ0k1u1Fl
+						OcqRD2xPzQ+CgOtzzvSIOrPD0yKhuwb1zJ66cu2cpRdITRnrg2ayP/gXiF+LAhTJ
+						ybc9lDB//HyWDrj9iU00cwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						LmZhbG1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguZmFsbW91dGguYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDl7aG6kieISm3+HL81qMYelebh9
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBvm0t4OJ4W610vCQDGC5irYM4JqFYItWAL783e
+						raMoAAhoQ37r+qfeXeZXox0tpz1A2Jt//4ub46//AOksCPbAa22mWoHyFxcJcjRR
+						ZR17kXkAaopgrcUhrrPSt+TFy2i2CHnuWcR1ypqyPj6nq5RfgptUYkJEVe4fwF6n
+						zjv7yp0173zZckOhbclz2yer9jl92eYG0eTVtOY43TILPkc55e5JDd72A2YfqLSz
+						8PF/30MxntDXnOWtFXYktXQW7u4cIEVFcOytK1kap6TQhjDVHulpPvFocfGj/OVp
+						Vk5or0/R1H+xdwevs2D+MnCZfXq8lZPgZHgthYP/lhIhlvvB
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUWuDfmWMXBDc8mOCon5/2pM7qoT4wDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51azAeFw0xNjAz
-						MTAxNDEyMzVaFw0zNjAzMTAxNDEyMzVaMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3Qu
-						ZmFsbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/
-						E+yAVkaXGCNuAzBkcNpezmHDV7SCZDRMIFwqCP6CMVGhoIf1maeIIuoiMFJeFyzT
-						XdARJ8WhFMZNJuOypFhMVrJKlM5nj9D4a8f4kaWYF4Nr0tV3TawypIPiJtTI+6Mo
-						EDeXMUQKfZRPcSDBeFDt03ZitnUG7fWPXcz0SPsGnLF9ZJUBxffvYTBy2luz8AKm
-						yCmqpGWzq/xfEjebm9LswCy3pOpOysi2jHNeoNeE2zJLKPPTF3o5XSAF50kfch9F
-						L/E5K+m6JJg/yiqZtrE44mDeVfxa+bAiTp8VN5cwBNneEHrmsuy++BSDE6s0l+DC
-						sZ8zHPU6xOsAfhPNVeZfAgMBAAGjeTB3MB0GA1UdDgQWBBQaPhDpAKZ+3Kd7kghO
-						0yh3mz4aPzBWBgNVHREETzBNghl0cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrhjBo
-						dHRwczovL3Ryc2hpYnRlc3QuZmFsbW91dGguYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAFMjx8Bg8/pd58cM0YXtTjYSHGZ8kNd6qnhcvkyo
-						o0NS5SDV5HyLlJG8sd8BdIk0hdNzwE02XYMTDx4OoeIx/ZbTk0MonmMwpT7JC4FL
-						HR0ApR+fSTIO4kFwFzouBic3toTADwOTJN7YDVSUqlBmdWSj/nv5OktoZ0BXFFOu
-						NHAz1et2Sup1z94vnjXsXmgNTVFpLKOwc8H6PL/5pZG4YT8AtRDGksrP/Y+cDGW6
-						saksfTnCQPJU28XqHdACWHj+CTeaYAR9JKJaZ24XWLldkCQiXovKlmxE16vODXu5
-						37GKjHMDpAns/LBj4zx6eud3JEdSfrMQEsgkkmAM5sVDVco=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUOJdFt95kXi6uUBnJeB0Fd94jY/swDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51azAeFw0xNjAz
-						MTAxNDEyMzdaFw0zNjAzMTAxNDEyMzdaMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3Qu
-						ZmFsbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb
-						T6lWMDfvSczfDYobj5gQg4KcxRifWJ3RPnpjH38+mjXlvfo8IzXoMTPMs1Q0wE4e
-						4+mrdr2fttn7dgRq2o5PqiVxmSCkBOLJGdK0cQcUqBb7x6FuXsKaKOA5S7Szs4ic
-						XpRrTUlitb9IdhwMC9BcOXZQp4FiUjXDL/hHNC7oaeiuH2tFSSwxcvwdW+Y8V49k
-						rwfU8ueKOKjZAU2XaXEnau0gwIDQFXdwlJdRJyl7FS8GSvkHWYPJjU+YjJ7DQuuu
-						GbqaKCsHggHvAWo0Qcx/IrY83WaJYk6BaXQs7za8yZlo9KY3e2ml0YykvPOy7qeJ
-						O73kzqYBOHsKk5SjGr6hAgMBAAGjeTB3MB0GA1UdDgQWBBQUfIxB/R8h/5yz3TBV
-						gvCuv2LyITBWBgNVHREETzBNghl0cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrhjBo
-						dHRwczovL3Ryc2hpYnRlc3QuZmFsbW91dGguYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBACxE4iIeeH8WuVinotJ9ItZRNm5zOhINEugfUMgP
-						8JXPqIK6ntJUYcLJJQP63D3WsZqL6beVmClBgBxUcs6HLKPRBvrBSVLrEYts3MvM
-						qLBur61WOs9Z/AKNR9P+1Xxuvv7kILdLx97sGnS+r+fOw+QkgFYliyRS0qbf0Qxk
-						kLhMKS6/1k0Uvu/CJj3eYgGB7R8LC4dY6fiMZI0ir5uHmjYflBvA0NBcUZROblB3
-						Dl2BP3JG3+9en6C43qFntSFWA5NMQKQtg5wb5WF2zkWzDjCVfHUEp31PvxrUGEa+
-						xmGxr0bsY8u5lgCP2Mg6iYcXdwNwHXU7vSAmyCNIJmSOn9k=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.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://trshibtest.falmouth.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.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://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.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://trshibtest.falmouth.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fxplus.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALdJ0CbH8jcGy4tEynFSTk1hpgN0MA0GCSqGSIb3DQEB
-						CwUAMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3QuZmFsbW91dGguYWMudWswHhcNMTYw
-						MzEwMTQxMjM3WhcNMzYwMzEwMTQxMjM3WjAkMSIwIAYDVQQDDBl0cnNoaWJ0ZXN0
+						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
+						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
 						LmZhbG1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						lFSN9874S8OSMzLJWs7ysZiQeyUhHBLpR3dRvTM6VmpP/r5k+pLdR/xCcjwMIP2v
-						sBDufMMHlbaFIZErS6J5mtlOmU2yYVsa3wvGqnMV0doX/LRPoYKKSJxIBgBoCx63
-						LXAS6l/ZBNuB8JjLYP9WEGda5JWNxE4iwFfFjcpLsqNljzcDHGzWzNC8tErKRZcz
-						Hj0ZgIfecO7gAQIdRKPo47qJ/ut4q9bplk+7MzfWJ8e3qQLetXw8yxlCse2johOy
-						DWNw7uduEwg7mQncUUTdO/m5VHwm0UGhozMf1bw837fdX0IZjGzZ5noQ3TfrDSQg
-						MImungTTMnMB4o9duqEV9QIDAQABo3kwdzAdBgNVHQ4EFgQUvUB+7I6pLrZfc0Xa
-						ozHOnzMbiCQwVgYDVR0RBE8wTYIZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51a4Yw
-						aHR0cHM6Ly90cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBCwUAA4IBAQAqhAE9QU4GG1vQUGbQaBFiggrrNQPaSe+J2dTg
-						7YieVe3dOf5AqcbYdMmFXuUvKGQoXRDlnvbDQDxRi9dtUsADFnc8/UtWF/eMSu/X
-						BOnhH2rdhvLFuxW2avNf8YAXxtqqp5GA+vwNl2/Gv2TtfSpDeXrIdcIQpO0gbTXK
-						UE1hJDOyv92s8yVzYOv9aHgdoT1AAy884K7ymWByZ6v05kAnfwqcuMxm8uG1yP08
-						ujQvJ+CUe/bMSrQNl4U/Z4DuRckI6qDvPfKyRR9hTRHS7uTksPODDyB/gykaLY0N
-						vl+qFY7UB/E826CYYavCmzHYeMyzopHS/uFOIJ/fNLcmnzde
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUWuDfmWMXBDc8mOCon5/2pM7qoT4wDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51azAeFw0xNjAz
-						MTAxNDEyMzVaFw0zNjAzMTAxNDEyMzVaMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3Qu
-						ZmFsbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/
-						E+yAVkaXGCNuAzBkcNpezmHDV7SCZDRMIFwqCP6CMVGhoIf1maeIIuoiMFJeFyzT
-						XdARJ8WhFMZNJuOypFhMVrJKlM5nj9D4a8f4kaWYF4Nr0tV3TawypIPiJtTI+6Mo
-						EDeXMUQKfZRPcSDBeFDt03ZitnUG7fWPXcz0SPsGnLF9ZJUBxffvYTBy2luz8AKm
-						yCmqpGWzq/xfEjebm9LswCy3pOpOysi2jHNeoNeE2zJLKPPTF3o5XSAF50kfch9F
-						L/E5K+m6JJg/yiqZtrE44mDeVfxa+bAiTp8VN5cwBNneEHrmsuy++BSDE6s0l+DC
-						sZ8zHPU6xOsAfhPNVeZfAgMBAAGjeTB3MB0GA1UdDgQWBBQaPhDpAKZ+3Kd7kghO
-						0yh3mz4aPzBWBgNVHREETzBNghl0cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrhjBo
-						dHRwczovL3Ryc2hpYnRlc3QuZmFsbW91dGguYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAFMjx8Bg8/pd58cM0YXtTjYSHGZ8kNd6qnhcvkyo
-						o0NS5SDV5HyLlJG8sd8BdIk0hdNzwE02XYMTDx4OoeIx/ZbTk0MonmMwpT7JC4FL
-						HR0ApR+fSTIO4kFwFzouBic3toTADwOTJN7YDVSUqlBmdWSj/nv5OktoZ0BXFFOu
-						NHAz1et2Sup1z94vnjXsXmgNTVFpLKOwc8H6PL/5pZG4YT8AtRDGksrP/Y+cDGW6
-						saksfTnCQPJU28XqHdACWHj+CTeaYAR9JKJaZ24XWLldkCQiXovKlmxE16vODXu5
-						37GKjHMDpAns/LBj4zx6eud3JEdSfrMQEsgkkmAM5sVDVco=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUOJdFt95kXi6uUBnJeB0Fd94jY/swDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZdHJzaGlidGVzdC5mYWxtb3V0aC5hYy51azAeFw0xNjAz
-						MTAxNDEyMzdaFw0zNjAzMTAxNDEyMzdaMCQxIjAgBgNVBAMMGXRyc2hpYnRlc3Qu
-						ZmFsbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb
-						T6lWMDfvSczfDYobj5gQg4KcxRifWJ3RPnpjH38+mjXlvfo8IzXoMTPMs1Q0wE4e
-						4+mrdr2fttn7dgRq2o5PqiVxmSCkBOLJGdK0cQcUqBb7x6FuXsKaKOA5S7Szs4ic
-						XpRrTUlitb9IdhwMC9BcOXZQp4FiUjXDL/hHNC7oaeiuH2tFSSwxcvwdW+Y8V49k
-						rwfU8ueKOKjZAU2XaXEnau0gwIDQFXdwlJdRJyl7FS8GSvkHWYPJjU+YjJ7DQuuu
-						GbqaKCsHggHvAWo0Qcx/IrY83WaJYk6BaXQs7za8yZlo9KY3e2ml0YykvPOy7qeJ
-						O73kzqYBOHsKk5SjGr6hAgMBAAGjeTB3MB0GA1UdDgQWBBQUfIxB/R8h/5yz3TBV
-						gvCuv2LyITBWBgNVHREETzBNghl0cnNoaWJ0ZXN0LmZhbG1vdXRoLmFjLnVrhjBo
-						dHRwczovL3Ryc2hpYnRlc3QuZmFsbW91dGguYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBACxE4iIeeH8WuVinotJ9ItZRNm5zOhINEugfUMgP
-						8JXPqIK6ntJUYcLJJQP63D3WsZqL6beVmClBgBxUcs6HLKPRBvrBSVLrEYts3MvM
-						qLBur61WOs9Z/AKNR9P+1Xxuvv7kILdLx97sGnS+r+fOw+QkgFYliyRS0qbf0Qxk
-						kLhMKS6/1k0Uvu/CJj3eYgGB7R8LC4dY6fiMZI0ir5uHmjYflBvA0NBcUZROblB3
-						Dl2BP3JG3+9en6C43qFntSFWA5NMQKQtg5wb5WF2zkWzDjCVfHUEp31PvxrUGEa+
-						xmGxr0bsY8u5lgCP2Mg6iYcXdwNwHXU7vSAmyCNIJmSOn9k=
+						htyRP37lfHCQSvTtB09QGwRMXaHxV0KcAyDm2haJWRVnS/Q2nCXkDH4N0l3nsb8S
+						ibeizS3gnWkJM52C4VXm1Dn/4jZEu0tT/yrjfz4LOWx6pPluUg29euLr7ICLdPAv
+						fjH0iQ4Ah2mVc0iEwtFhrnDCV1uGPgxsu8DpiV0TrpoqTlEIzcB9z6Y4ha7yuZ2j
+						p0SP1piRoFBoeXeRDJ3D4Lprw8YV1ZKLOZaeyI8n8KIwspLZLcAqIkGoJ0k1u1Fl
+						OcqRD2xPzQ+CgOtzzvSIOrPD0yKhuwb1zJ66cu2cpRdITRnrg2ayP/gXiF+LAhTJ
+						ybc9lDB//HyWDrj9iU00cwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+						LmZhbG1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguZmFsbW91dGguYWMu
+						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDl7aG6kieISm3+HL81qMYelebh9
+						MA0GCSqGSIb3DQEBBQUAA4IBAQBvm0t4OJ4W610vCQDGC5irYM4JqFYItWAL783e
+						raMoAAhoQ37r+qfeXeZXox0tpz1A2Jt//4ub46//AOksCPbAa22mWoHyFxcJcjRR
+						ZR17kXkAaopgrcUhrrPSt+TFy2i2CHnuWcR1ypqyPj6nq5RfgptUYkJEVe4fwF6n
+						zjv7yp0173zZckOhbclz2yer9jl92eYG0eTVtOY43TILPkc55e5JDd72A2YfqLSz
+						8PF/30MxntDXnOWtFXYktXQW7u4cIEVFcOytK1kap6TQhjDVHulpPvFocfGj/OVp
+						Vk5or0/R1H+xdwevs2D+MnCZfXq8lZPgZHgthYP/lhIhlvvB
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Falmouth University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Falmouth University TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.falmouth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Pellow</SurName>
-    <EmailAddress>mailto:steve.pellow@fxplus.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Pellow</SurName>
-    <EmailAddress>mailto:steve.pellow@fxplus.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Falmouth University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Falmouth University TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.falmouth.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Pellow</md:SurName>
+    <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Pellow</md:SurName>
+    <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>