resolve conflicts and merge

1 files changed, 50 insertions, 64 deletions

diff --git a/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
index e0833b1e..486ee69e 100644
--- a/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
@@ -12,41 +12,34 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIFsDCCBJigAwIBAgIQXu8JCm8fuup6gdylhWdWFDANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDgxMDAwMDAwMFoXDTE1MDgxMDIzNTk1OVowgY0xCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1UeW5lIEFuZCBXZWFyMRYwFAYDVQQHEw1Tb3V0aCBT
-						aGllbGRzMR8wHQYDVQQKExZTb3V0aCBUeW5lc2lkZSBDb2xsZWdlMRUwEwYDVQQL
-						EwxJQ1QgU2VydmljZXMxFjAUBgNVBAMTDWlkcC5zdGMuYWMudWswggIiMA0GCSqG
-						SIb3DQEBAQUAA4ICDwAwggIKAoICAQC2QlogZqPu+Z+g/fH48fbj6ftQrRICRWGq
-						fWJkiDaqVEdbMHgaiYeiexHwTSflThrH+MtOdrxtNpjXp1v9jl62fhHUbxKE2X4K
-						uWHTZcGg3XvuzIcv7rQMfMtTOCvyFyEoxsRcSaSFvRPo4Vc6uGXFUJGDICOR5DjO
-						fgh8XlE0G3WD3xKAMF6h1I+XB6a1I0bN8vTdg1Ug38XCovOrN7Dhu7QVh+WjvLlx
-						du1xJaMh90wIhHyGwIZAZazgljo5jKwcCR1b0Izdj904ao5DGkrYpOEhb9hBSTtB
-						Jco0VjfiKNj0cnT95+F7+RGsQv5xtV62Vg10YoXQGhF+TmmXmOW+5p6uJrhNQJ6z
-						Nx4WjWjlGrW/QfAsZii5refcg4EyEWXJ1GTVrMvQFHwlT6RXokw6dO2Us79v43DK
-						ikb0fehn+3t9yzWhhyHU/756OH96os6iWA3oALqANiXHGQJBdT+oOL4Q7if+tKvu
-						exMi6LKrbt3QigZORAWq27G6nAx3jcRn+pzGpLt19XXOhKyokw4HeBCoZSoMR5JF
-						xNfH4KIvE41mZ7U3tro2x1NrCnmATFQXBV5HBecpHJPFzI+yNcw+Ek1dRkGztG/g
-						0frtiX8QVgzDdJpmAkO8BKi4cqMQg8RXnNnvnadDR4YgceyUfVqnzRuVP4lSI9Lr
-						5dsaeWfgdwIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFMO0dzzS4yDzx1HflQE8b+bjHpzPMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-						dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-						BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-						RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-						bmEub3JnMBgGA1UdEQQRMA+CDWlkcC5zdGMuYWMudWswDQYJKoZIhvcNAQEFBQAD
-						ggEBAFMVDYePuVrK9grWcvMbr96/WPdaRKywCzN9mjRxwhTyINqqMIaGShaKF01l
-						rknCZJ8qcyl3Kp/4Xkc419W8ZMBnjtwtCaGJMss2lk9lbLU3s2aAULg/DJ2kqakS
-						yO3Eya3tyb0vwqYmAbPbj2nJBHwCTo4e9wCXyXSugJXtb/MxnP4DvI0ZWct+h5p4
-						STKILRVEltuP/BGnvDudPhzPg75fGliy4EDA4BPj93uQnbkkDprcRQFIiit13YLg
-						JlZQysM+JuuivWbK1cEl3rJloysn1G5cX53BoFSqwj9hsZp0vXRYvZ+TzOS7NFYy
-						Idc6Eao+Yumry94nrhXQv0brzfQ=
+						MIIEVDCCAzygAwIBAgIJALDkB+x72chfMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEWMBQGA1UEBwwNU291dGggU2hpZWxk
+						czEfMB0GA1UECgwWU291dGggVHluZXNpZGUgQ29sbGVnZTEVMBMGA1UECwwMSUNU
+						IFNlcnZpY2VzMRYwFAYDVQQDDA1pZHAuc3RjLmFjLnVrMSEwHwYJKoZIhvcNAQkB
+						FhJoZWxwZGVza0BzdGMuYWMudWswHhcNMTUwNzI5MDkxMzQ4WhcNMjUwNzI2MDkx
+						MzQ4WjCBqjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxFjAUBgNVBAcM
+						DVNvdXRoIFNoaWVsZHMxHzAdBgNVBAoMFlNvdXRoIFR5bmVzaWRlIENvbGxlZ2Ux
+						FTATBgNVBAsMDElDVCBTZXJ2aWNlczEWMBQGA1UEAwwNaWRwLnN0Yy5hYy51azEh
+						MB8GCSqGSIb3DQEJARYSaGVscGRlc2tAc3RjLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEApEZ0XWtW2m/iOq10H+uBFrLZTuAHM9KnTUMP0ox5
+						e+4WgZrg5u+k1yJewbnlqyibexk+wWNPrKzIO5NSdAGhl2uOIq3wDOvoxx972UXL
+						7dDSyFZeTYzsRaCrqjcBfr/d9MpoZyXqGL9wQ/gbetNvOvNNaD3L0U9r4bDBYox5
+						d1X1fNvuoDc/eHo8ZeRvJZ27gWKJ42zB9DlD9g1aDYmkUkwVjm0fBcLZMxB4pyqw
+						TptwzLgVzCG/haLzW9TD3QU33++CQKL9WUJzwUHJAC2OPQIupYWusrnu0lDHoFma
+						33uv9tHbm60fCkZkrh7oi4rWIyaE6vC50S2wX701gpsPLQIDAQABo3sweTAJBgNV
+						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+						Y2F0ZTAdBgNVHQ4EFgQUpywsb6c9Gnj9ZkZ53piQHFyHgvQwHwYDVR0jBBgwFoAU
+						pywsb6c9Gnj9ZkZ53piQHFyHgvQwDQYJKoZIhvcNAQELBQADggEBADfNyBuwa/Gy
+						U95f4+Ko6FX2vFMAFVsXqk4Ab1vPIAf2D/dBwRqXUZo3V5ySOmMog1CB1GkeFWNq
+						xPXS1wFlQ65RGGk867oerHcHpRMWdwTYM0RQzA3Hx43iwVavVneLBNdKyYKR9Zzk
+						Hk4shGwqX2F1nntw7kdVdq1YqZ3bh3Vebq5qQIQkweRSkbERFO9aXGFN/kWutbcz
+						UhpUBEUi/UtOqkZuM+TRALVZ607weHpGyBGI7jwDcmWXVO9YmeDc8emteYxs8dAm
+						jDL05U1aL0Z0PSzm6d/gNgs7vlx4GHz1Nh5B6j+WRQkItxJ/5JN+jS8rfehMm6df
+						nO1NevMrfrw=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -64,41 +57,34 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIFsDCCBJigAwIBAgIQXu8JCm8fuup6gdylhWdWFDANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDgxMDAwMDAwMFoXDTE1MDgxMDIzNTk1OVowgY0xCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1UeW5lIEFuZCBXZWFyMRYwFAYDVQQHEw1Tb3V0aCBT
-						aGllbGRzMR8wHQYDVQQKExZTb3V0aCBUeW5lc2lkZSBDb2xsZWdlMRUwEwYDVQQL
-						EwxJQ1QgU2VydmljZXMxFjAUBgNVBAMTDWlkcC5zdGMuYWMudWswggIiMA0GCSqG
-						SIb3DQEBAQUAA4ICDwAwggIKAoICAQC2QlogZqPu+Z+g/fH48fbj6ftQrRICRWGq
-						fWJkiDaqVEdbMHgaiYeiexHwTSflThrH+MtOdrxtNpjXp1v9jl62fhHUbxKE2X4K
-						uWHTZcGg3XvuzIcv7rQMfMtTOCvyFyEoxsRcSaSFvRPo4Vc6uGXFUJGDICOR5DjO
-						fgh8XlE0G3WD3xKAMF6h1I+XB6a1I0bN8vTdg1Ug38XCovOrN7Dhu7QVh+WjvLlx
-						du1xJaMh90wIhHyGwIZAZazgljo5jKwcCR1b0Izdj904ao5DGkrYpOEhb9hBSTtB
-						Jco0VjfiKNj0cnT95+F7+RGsQv5xtV62Vg10YoXQGhF+TmmXmOW+5p6uJrhNQJ6z
-						Nx4WjWjlGrW/QfAsZii5refcg4EyEWXJ1GTVrMvQFHwlT6RXokw6dO2Us79v43DK
-						ikb0fehn+3t9yzWhhyHU/756OH96os6iWA3oALqANiXHGQJBdT+oOL4Q7if+tKvu
-						exMi6LKrbt3QigZORAWq27G6nAx3jcRn+pzGpLt19XXOhKyokw4HeBCoZSoMR5JF
-						xNfH4KIvE41mZ7U3tro2x1NrCnmATFQXBV5HBecpHJPFzI+yNcw+Ek1dRkGztG/g
-						0frtiX8QVgzDdJpmAkO8BKi4cqMQg8RXnNnvnadDR4YgceyUfVqnzRuVP4lSI9Lr
-						5dsaeWfgdwIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFMO0dzzS4yDzx1HflQE8b+bjHpzPMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-						dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-						BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-						RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-						bmEub3JnMBgGA1UdEQQRMA+CDWlkcC5zdGMuYWMudWswDQYJKoZIhvcNAQEFBQAD
-						ggEBAFMVDYePuVrK9grWcvMbr96/WPdaRKywCzN9mjRxwhTyINqqMIaGShaKF01l
-						rknCZJ8qcyl3Kp/4Xkc419W8ZMBnjtwtCaGJMss2lk9lbLU3s2aAULg/DJ2kqakS
-						yO3Eya3tyb0vwqYmAbPbj2nJBHwCTo4e9wCXyXSugJXtb/MxnP4DvI0ZWct+h5p4
-						STKILRVEltuP/BGnvDudPhzPg75fGliy4EDA4BPj93uQnbkkDprcRQFIiit13YLg
-						JlZQysM+JuuivWbK1cEl3rJloysn1G5cX53BoFSqwj9hsZp0vXRYvZ+TzOS7NFYy
-						Idc6Eao+Yumry94nrhXQv0brzfQ=
+						MIIEVDCCAzygAwIBAgIJALDkB+x72chfMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEWMBQGA1UEBwwNU291dGggU2hpZWxk
+						czEfMB0GA1UECgwWU291dGggVHluZXNpZGUgQ29sbGVnZTEVMBMGA1UECwwMSUNU
+						IFNlcnZpY2VzMRYwFAYDVQQDDA1pZHAuc3RjLmFjLnVrMSEwHwYJKoZIhvcNAQkB
+						FhJoZWxwZGVza0BzdGMuYWMudWswHhcNMTUwNzI5MDkxMzQ4WhcNMjUwNzI2MDkx
+						MzQ4WjCBqjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxFjAUBgNVBAcM
+						DVNvdXRoIFNoaWVsZHMxHzAdBgNVBAoMFlNvdXRoIFR5bmVzaWRlIENvbGxlZ2Ux
+						FTATBgNVBAsMDElDVCBTZXJ2aWNlczEWMBQGA1UEAwwNaWRwLnN0Yy5hYy51azEh
+						MB8GCSqGSIb3DQEJARYSaGVscGRlc2tAc3RjLmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEApEZ0XWtW2m/iOq10H+uBFrLZTuAHM9KnTUMP0ox5
+						e+4WgZrg5u+k1yJewbnlqyibexk+wWNPrKzIO5NSdAGhl2uOIq3wDOvoxx972UXL
+						7dDSyFZeTYzsRaCrqjcBfr/d9MpoZyXqGL9wQ/gbetNvOvNNaD3L0U9r4bDBYox5
+						d1X1fNvuoDc/eHo8ZeRvJZ27gWKJ42zB9DlD9g1aDYmkUkwVjm0fBcLZMxB4pyqw
+						TptwzLgVzCG/haLzW9TD3QU33++CQKL9WUJzwUHJAC2OPQIupYWusrnu0lDHoFma
+						33uv9tHbm60fCkZkrh7oi4rWIyaE6vC50S2wX701gpsPLQIDAQABo3sweTAJBgNV
+						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+						Y2F0ZTAdBgNVHQ4EFgQUpywsb6c9Gnj9ZkZ53piQHFyHgvQwHwYDVR0jBBgwFoAU
+						pywsb6c9Gnj9ZkZ53piQHFyHgvQwDQYJKoZIhvcNAQELBQADggEBADfNyBuwa/Gy
+						U95f4+Ko6FX2vFMAFVsXqk4Ab1vPIAf2D/dBwRqXUZo3V5ySOmMog1CB1GkeFWNq
+						xPXS1wFlQ65RGGk867oerHcHpRMWdwTYM0RQzA3Hx43iwVavVneLBNdKyYKR9Zzk
+						Hk4shGwqX2F1nntw7kdVdq1YqZ3bh3Vebq5qQIQkweRSkbERFO9aXGFN/kWutbcz
+						UhpUBEUi/UtOqkZuM+TRALVZ607weHpGyBGI7jwDcmWXVO9YmeDc8emteYxs8dAm
+						jDL05U1aL0Z0PSzm6d/gNgs7vlx4GHz1Nh5B6j+WRQkItxJ/5JN+jS8rfehMm6df
+						nO1NevMrfrw=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>