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

1 files changed, 48 insertions, 55 deletions

diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
index bd7f0926..e00cf585 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The University of Manchester.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
   </Extensions>
@@ -36,36 +33,34 @@
         <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEvzCCA6egAwIBAgIQLnN/xcI/Xs3CPSU+WOVMZTANBgkqhkiG9w0BAQUFADA2
+						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEwMDkxMDAwMDAwMFoXDTEzMDkwOTIzNTk1OVowgZQxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
-						MSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyMRQwEgYDVQQL
-						EwtJVCBTZXJ2aWNlczEeMBwGA1UEAxMVc2hpYi5tYW5jaGVzdGVyLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+5jTMZQrSd7hG0fSjcZeMMXa
-						UaH+A8qCgrvxXwcryA36/cweR9j/JhkHzg9KOPcYhJBQnZaM1WvH/Gt8jY2N6R4I
-						mxCDF0idUGpT/gqyDa/2t9jvFmFfWQNsN65EoILVscZlQxx0Pbn05dpZr5BoNWdP
-						t1QonOZhBAxwylypuAlqOQhp0/Pxc0w9rCXxnUrH4tVgypOhn3/ob/VWQo1s0iYF
-						7bi4GD+WXvWXA4HCrqpcJaTszjujRDCPHc3xzKfsky/uASWmoRdMz7jrHyRXYuv6
-						+RrJlS7SV4kLj7LUT1U8G/ZkLoTpgwuM2HD34wOPco6pwq3iUwAib+meNq5rUQID
-						AQABo4IBaDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
-						VR0OBBYEFDcK/i8sny58zSGKte9rTVhg19rSMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-						HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
-						ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
-						BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAG
-						A1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rlci5hYy51azANBgkqhkiG9w0BAQUFAAOC
-						AQEATgcGt1SIaqePVFQx4NyK3i6G1Jm+L/+AOAOwMznYzxSPU6JVYX+xWLhDBTaw
-						vBHWR4+KKKmKpumfInTVPHBFOIH1qhHbEtZjFJU67y1H0KacftFOdVP6O3KD2jep
-						s6F/P4ioVtk/djtSKW0KO/ejOP5UoPM9xmls6rGf+fwfDY+5XRFN0JRIFhBy+Ejx
-						WaVcxswtlMYB7ecmfIuUkhGjsmaZP3bfY6ThpkUFw+fajNfBPNJarmN6FXQYIUyz
-						OqOnjEJ/2UdVSaMlZCk6DeqMOxpeSg1hAq1m1OiyUepzJZ4zo6W5a90/Q56hPaYE
-						hCCkj8L8NyX2H2RPH9QLJpIbVg==
+						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
+						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
+						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
+						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
+						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
+						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
+						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
+						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
+						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
+						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
+						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
+						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
+						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
+						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
+						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -83,36 +78,34 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIEvzCCA6egAwIBAgIQLnN/xcI/Xs3CPSU+WOVMZTANBgkqhkiG9w0BAQUFADA2
+						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEwMDkxMDAwMDAwMFoXDTEzMDkwOTIzNTk1OVowgZQxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
-						MSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyMRQwEgYDVQQL
-						EwtJVCBTZXJ2aWNlczEeMBwGA1UEAxMVc2hpYi5tYW5jaGVzdGVyLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+5jTMZQrSd7hG0fSjcZeMMXa
-						UaH+A8qCgrvxXwcryA36/cweR9j/JhkHzg9KOPcYhJBQnZaM1WvH/Gt8jY2N6R4I
-						mxCDF0idUGpT/gqyDa/2t9jvFmFfWQNsN65EoILVscZlQxx0Pbn05dpZr5BoNWdP
-						t1QonOZhBAxwylypuAlqOQhp0/Pxc0w9rCXxnUrH4tVgypOhn3/ob/VWQo1s0iYF
-						7bi4GD+WXvWXA4HCrqpcJaTszjujRDCPHc3xzKfsky/uASWmoRdMz7jrHyRXYuv6
-						+RrJlS7SV4kLj7LUT1U8G/ZkLoTpgwuM2HD34wOPco6pwq3iUwAib+meNq5rUQID
-						AQABo4IBaDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
-						VR0OBBYEFDcK/i8sny58zSGKte9rTVhg19rSMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-						HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
-						ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
-						BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAG
-						A1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rlci5hYy51azANBgkqhkiG9w0BAQUFAAOC
-						AQEATgcGt1SIaqePVFQx4NyK3i6G1Jm+L/+AOAOwMznYzxSPU6JVYX+xWLhDBTaw
-						vBHWR4+KKKmKpumfInTVPHBFOIH1qhHbEtZjFJU67y1H0KacftFOdVP6O3KD2jep
-						s6F/P4ioVtk/djtSKW0KO/ejOP5UoPM9xmls6rGf+fwfDY+5XRFN0JRIFhBy+Ejx
-						WaVcxswtlMYB7ecmfIuUkhGjsmaZP3bfY6ThpkUFw+fajNfBPNJarmN6FXQYIUyz
-						OqOnjEJ/2UdVSaMlZCk6DeqMOxpeSg1hAq1m1OiyUepzJZ4zo6W5a90/Q56hPaYE
-						hCCkj8L8NyX2H2RPH9QLJpIbVg==
+						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
+						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
+						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
+						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
+						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
+						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
+						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
+						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
+						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
+						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
+						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
+						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
+						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
+						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
+						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>