resolve conflicts and merge

1 files changed, 46 insertions, 58 deletions

diff --git a/swamid-interfederations-2.0/lse.ac.uk-idp.xml b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
index fe216ab7..538a8ede 100644
--- a/swamid-interfederations-2.0/lse.ac.uk-idp.xml
+++ b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
@@ -12,38 +12,32 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIFMDCCBBigAwIBAgILAQAAAAABKq7oAYQwDQYJKoZIhvcNAQEFBQAwajEjMCEG
-						A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-						bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-						b24gQ0EwHhcNMTAwODI2MTQwMDA3WhcNMTUwODI2MTQwMDA2WjCBpTELMAkGA1UE
-						BhMCR0IxDzANBgNVBAgTBkxvbmRvbjEXMBUGA1UEBxMOR3JlYXRlciBMb25kb24x
-						EDAOBgNVBAsTB0xpYnJhcnkxOTA3BgNVBAoTMExvbmRvbiBTY2hvb2wgb2YgRWNv
-						bm9taWNzIGFuZCBQb2xpdGljYWwgU2NpZW5jZTEfMB0GA1UEAxMWZ2F0ZS5saWJy
-						YXJ5LmxzZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrE
-						lEgnIq2xpH4ztZ3DAc5/1AiykNaad+v+5DHohA+aWemWgUqg9clHwaN3jkwK1g54
-						R4//DrKcjxiCaPxstw3ODc7pG5lGkihZ2Ew2+fg/pblh4UhFMmRv7iaUl5jDoNz9
-						7y5/YZ0rStnPTQ3iynfl2ypURFh+9hSh7MiMqGjQjqkzjtve0olQlQ06srdGNSa+
-						WhkV4IFr48L+fSpTJNnu/XLWposL+ZHVH5HSpOGST2dhXLA7tOZeGh0qC2XObgCE
-						4NpcDr3FQYWTGhDz95vb7kdBf7yrMBKwwkJC5DRiHyxS9zGlamB+nRvIgxYbLikb
-						7rugz0QDu/vQxxHvkCsCAwEAAaOCAZkwggGVMB8GA1UdIwQYMBaAFH1tKuxmq6dR
-						NqsCafFwj8RZC5ofMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
-						L3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvb3JndjEuY3J0MD8GA1UdHwQ4
-						MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvT3JnYW5pemF0aW9u
-						VmFsMS5jcmwwHQYDVR0OBBYEFIrzweZBjZRanmFejLLkK74xdaWZMAkGA1UdEwQC
-						MAAwDgYDVR0PAQH/BAQDAgWgMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcD
-						AgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBFDAzMDEGCCsGAQUF
-						BwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCG
-						SAGG+EIBAQQEAwIGwDAhBgNVHREEGjAYghZnYXRlLmxpYnJhcnkubHNlLmFjLnVr
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBdWOcNxu5Mh7ilUgSr8UlwWpjqJ7GgXMZwbVk+
-						2q++FeptORv0yJxIVvDsmbFwKqwvp3123aBAFaG9WQPAXL0Wz+P7wYymZH/G1XSr
-						+NsLfXaYRvmmwySBWfq0NQJEU9uGDHTOtX4wCZLiQFfM+e+TRkwZ7pMHoI956bOp
-						7gYRTux7lAWqJbc5cJ9o61ev/AnP+5TPXEXNFzcLDP+zp4knO9JkG39yY3DO97fx
-						S6FeuFcX0f1neB/aTknIH/D2by2/RTpvl3bTKKqoGN7YyQO7TH+sR7wZaSnqjKDn
-						IEMWqUMBdf7PSA/0yLPierGPBFLmkn+UmFv38wt09uGqCdDj
+						MIIEGDCCAwCgAwIBAgIJAMSJ8KNJAsS2MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25k
+						b24xOTA3BgNVBAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xp
+						dGljYWwgU2NpZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azAe
+						Fw0xNTA3MjgxNDAwMDhaFw0yOTA0MDUxNDAwMDhaMIGUMQswCQYDVQQGEwJHQjEQ
+						MA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25kb24xOTA3BgNV
+						BAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xpdGljYWwgU2Np
+						ZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBALTgyUuk/MYkOU7fRoZEhsP94EmmRVaf4xuk
+						unWtEP3uHxFISjOUGFMfym4Q9ZHN6NeFv6MS5GcKVy6oM+uXZM6ypMjh+VWLwWDM
+						RS28aDPKZzU/o0HPBzQ3kgXLW8R3rtrsrXHaU42x+SDj/JyzGtNmdqdjzzeWKZNZ
+						6GeWwOgma58EEDM2gQxABrUkGH1dHq+WTawksWwx7Zsfe8XbM/x7q4S1GrWM1rig
+						TR2DXSzFY+gc3n65iAosEBNCOjsoyo7L7XwYHiEkEtO+9+XzVv/xVuI3jgR2C2Hk
+						i937R5fBXVD0Hu0/Ht0dd8MU523bJhLBzjkmZWSMQ/B1iFWijFsCAwEAAaNrMGkw
+						CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMDAGA1UdEQQpMCeCFmdhdGUubGlicmFyeS5sc2UuYWMudWuCDWlkcC5s
+						c2UuYWMudWswDQYJKoZIhvcNAQELBQADggEBACVXg7gRZZDbNhZPGVmaq3ESLYfn
+						6/cpKUeDjoONhmEHx2XVJdXYT/nQFElzKwdpVvqYnmcZ8QDyY1JfSoUgrgUDxr+6
+						FsUc9VSkyQtv3MpBjszbIP1221XhOz63riFOC5PUKvoYY5Qx4nIsBZ96QoqT173E
+						dQNJHLnkvuwajtK98k18TxObCbkpCXnndUb0rYtEg/YCVIpw57CPXE4/lQpp2cL5
+						4mEize79TCVVwME5wVdf/g4urEIRuJLtCHNbB5e031IdEiCAwR+zIYhkMB75GRWK
+						mXHo7ijvy+fciSoWf0zFgvSvic5tGFzTi17zHZbfVFNv+lb7DVSwnx68qjA=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -61,38 +55,32 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIFMDCCBBigAwIBAgILAQAAAAABKq7oAYQwDQYJKoZIhvcNAQEFBQAwajEjMCEG
-						A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-						bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-						b24gQ0EwHhcNMTAwODI2MTQwMDA3WhcNMTUwODI2MTQwMDA2WjCBpTELMAkGA1UE
-						BhMCR0IxDzANBgNVBAgTBkxvbmRvbjEXMBUGA1UEBxMOR3JlYXRlciBMb25kb24x
-						EDAOBgNVBAsTB0xpYnJhcnkxOTA3BgNVBAoTMExvbmRvbiBTY2hvb2wgb2YgRWNv
-						bm9taWNzIGFuZCBQb2xpdGljYWwgU2NpZW5jZTEfMB0GA1UEAxMWZ2F0ZS5saWJy
-						YXJ5LmxzZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrE
-						lEgnIq2xpH4ztZ3DAc5/1AiykNaad+v+5DHohA+aWemWgUqg9clHwaN3jkwK1g54
-						R4//DrKcjxiCaPxstw3ODc7pG5lGkihZ2Ew2+fg/pblh4UhFMmRv7iaUl5jDoNz9
-						7y5/YZ0rStnPTQ3iynfl2ypURFh+9hSh7MiMqGjQjqkzjtve0olQlQ06srdGNSa+
-						WhkV4IFr48L+fSpTJNnu/XLWposL+ZHVH5HSpOGST2dhXLA7tOZeGh0qC2XObgCE
-						4NpcDr3FQYWTGhDz95vb7kdBf7yrMBKwwkJC5DRiHyxS9zGlamB+nRvIgxYbLikb
-						7rugz0QDu/vQxxHvkCsCAwEAAaOCAZkwggGVMB8GA1UdIwQYMBaAFH1tKuxmq6dR
-						NqsCafFwj8RZC5ofMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
-						L3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvb3JndjEuY3J0MD8GA1UdHwQ4
-						MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvT3JnYW5pemF0aW9u
-						VmFsMS5jcmwwHQYDVR0OBBYEFIrzweZBjZRanmFejLLkK74xdaWZMAkGA1UdEwQC
-						MAAwDgYDVR0PAQH/BAQDAgWgMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcD
-						AgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBFDAzMDEGCCsGAQUF
-						BwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCG
-						SAGG+EIBAQQEAwIGwDAhBgNVHREEGjAYghZnYXRlLmxpYnJhcnkubHNlLmFjLnVr
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBdWOcNxu5Mh7ilUgSr8UlwWpjqJ7GgXMZwbVk+
-						2q++FeptORv0yJxIVvDsmbFwKqwvp3123aBAFaG9WQPAXL0Wz+P7wYymZH/G1XSr
-						+NsLfXaYRvmmwySBWfq0NQJEU9uGDHTOtX4wCZLiQFfM+e+TRkwZ7pMHoI956bOp
-						7gYRTux7lAWqJbc5cJ9o61ev/AnP+5TPXEXNFzcLDP+zp4knO9JkG39yY3DO97fx
-						S6FeuFcX0f1neB/aTknIH/D2by2/RTpvl3bTKKqoGN7YyQO7TH+sR7wZaSnqjKDn
-						IEMWqUMBdf7PSA/0yLPierGPBFLmkn+UmFv38wt09uGqCdDj
+						MIIEGDCCAwCgAwIBAgIJAMSJ8KNJAsS2MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
+						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25k
+						b24xOTA3BgNVBAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xp
+						dGljYWwgU2NpZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azAe
+						Fw0xNTA3MjgxNDAwMDhaFw0yOTA0MDUxNDAwMDhaMIGUMQswCQYDVQQGEwJHQjEQ
+						MA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25kb24xOTA3BgNV
+						BAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xpdGljYWwgU2Np
+						ZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azCCASIwDQYJKoZI
+						hvcNAQEBBQADggEPADCCAQoCggEBALTgyUuk/MYkOU7fRoZEhsP94EmmRVaf4xuk
+						unWtEP3uHxFISjOUGFMfym4Q9ZHN6NeFv6MS5GcKVy6oM+uXZM6ypMjh+VWLwWDM
+						RS28aDPKZzU/o0HPBzQ3kgXLW8R3rtrsrXHaU42x+SDj/JyzGtNmdqdjzzeWKZNZ
+						6GeWwOgma58EEDM2gQxABrUkGH1dHq+WTawksWwx7Zsfe8XbM/x7q4S1GrWM1rig
+						TR2DXSzFY+gc3n65iAosEBNCOjsoyo7L7XwYHiEkEtO+9+XzVv/xVuI3jgR2C2Hk
+						i937R5fBXVD0Hu0/Ht0dd8MU523bJhLBzjkmZWSMQ/B1iFWijFsCAwEAAaNrMGkw
+						CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMDAGA1UdEQQpMCeCFmdhdGUubGlicmFyeS5sc2UuYWMudWuCDWlkcC5s
+						c2UuYWMudWswDQYJKoZIhvcNAQELBQADggEBACVXg7gRZZDbNhZPGVmaq3ESLYfn
+						6/cpKUeDjoONhmEHx2XVJdXYT/nQFElzKwdpVvqYnmcZ8QDyY1JfSoUgrgUDxr+6
+						FsUc9VSkyQtv3MpBjszbIP1221XhOz63riFOC5PUKvoYY5Qx4nIsBZ96QoqT173E
+						dQNJHLnkvuwajtK98k18TxObCbkpCXnndUb0rYtEg/YCVIpw57CPXE4/lQpp2cL5
+						4mEize79TCVVwME5wVdf/g4urEIRuJLtCHNbB5e031IdEiCAwR+zIYhkMB75GRWK
+						mXHo7ijvy+fciSoWf0zFgvSvic5tGFzTi17zHZbfVFNv+lb7DVSwnx68qjA=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>