diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
| commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
| tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml index 58442e09..0c060cce 100644 --- a/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml +++ b/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml @@ -47,40 +47,6 @@ </ds:X509Data> </ds:KeyInfo> </KeyDescriptor> - <KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIEwjCCA6qgAwIBAgIQWxPdS8jCDo8CQ9VCPed5HzANBgkqhkiG9w0BAQUFADA2 - MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg - U1NMIENBMB4XDTEyMDcyNjAwMDAwMFoXDTE1MDcyNjIzNTk1OVowgZMxCzAJBgNV - BAYTAkdCMRgwFgYDVQQIEw9XZXN0IExhbmNhc2hpcmUxETAPBgNVBAcTCE9ybXNr - aXJrMR0wGwYDVQQKExRFZGdlIEhpbGwgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQg - U2VydmljZXMxIjAgBgNVBAMTGXNoaWJib2xldGguZWRnZWhpbGwuYWMudWswggEi - MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCthQGEpUJ/yS9OfmAkx6OZg6Wh - FzM1cXm63rNtc2uZkd+ozCw3WtQKKyDRBr8Q7XbJr50fwKptdNJ3T0oWTIWLy38U - 69KC8EwSAVy63DSWOhR4Quk+WzIc84XSfJWzQo3uFfJxx0N4K19ppIUP66oA8rII - 9HsSSFfSDKkIARrCu+hvYv1qhIVsFRqF8REjrq5uh/Ono8MjMxshAPc6bGc5gZdu - d5NkvWy0vWUo472pkKBYnLShqI6+7gR5pIpoisasohleI6cYIW5SnSHv4OPILRRF - KLsjc5VKRyrcp51ZR61PD2ugifyHtY3t1fQMKzE8Xu10uegPvh8dP1ReHeDrAgMB - AAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV - HQ4EFgQUa57IILbkKZWeXJJRgQDqoRdmZhcwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud - EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR - MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50 - Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG - CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB - LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYD - VR0RBB0wG4IZc2hpYmJvbGV0aC5lZGdlaGlsbC5hYy51azANBgkqhkiG9w0BAQUF - AAOCAQEAJ1aYSHILz1s8FOUJ8CyMaY6SJ51sIDsUR/CzifMmTaYi/tWoTVO+GQWg - yZJnChdXnQPRXs2H24F7HXGERAlLVy52Iu1S3ki7QaAbHz2/RtVcclrhepZAgMAe - 0MXVBU6ZQmx5GLXr54lmU9eZqttIAJF0Z4yQJUVWsJG/1Y9zhabO2xwqZGAZNvdR - un+tHnO3jqbRxuhvqKQRWH3hTxOQykP3HN8cMvy5zKhz/7Sc0Mub+1RRMo8aIx/V - xn4HkrUz5OwdKNj8DIn8uLlo3BCRPqo2J/ar4yAyNFbG0bBj20vNsgM8MxTWQg1o - NovUGgpJ3goRRkkfWFQ2MkKl4od7aQ== - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/> <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/> <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> @@ -129,40 +95,6 @@ </ds:X509Data> </ds:KeyInfo> </KeyDescriptor> - <KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIEwjCCA6qgAwIBAgIQWxPdS8jCDo8CQ9VCPed5HzANBgkqhkiG9w0BAQUFADA2 - MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg - U1NMIENBMB4XDTEyMDcyNjAwMDAwMFoXDTE1MDcyNjIzNTk1OVowgZMxCzAJBgNV - BAYTAkdCMRgwFgYDVQQIEw9XZXN0IExhbmNhc2hpcmUxETAPBgNVBAcTCE9ybXNr - aXJrMR0wGwYDVQQKExRFZGdlIEhpbGwgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQg - U2VydmljZXMxIjAgBgNVBAMTGXNoaWJib2xldGguZWRnZWhpbGwuYWMudWswggEi - MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCthQGEpUJ/yS9OfmAkx6OZg6Wh - FzM1cXm63rNtc2uZkd+ozCw3WtQKKyDRBr8Q7XbJr50fwKptdNJ3T0oWTIWLy38U - 69KC8EwSAVy63DSWOhR4Quk+WzIc84XSfJWzQo3uFfJxx0N4K19ppIUP66oA8rII - 9HsSSFfSDKkIARrCu+hvYv1qhIVsFRqF8REjrq5uh/Ono8MjMxshAPc6bGc5gZdu - d5NkvWy0vWUo472pkKBYnLShqI6+7gR5pIpoisasohleI6cYIW5SnSHv4OPILRRF - KLsjc5VKRyrcp51ZR61PD2ugifyHtY3t1fQMKzE8Xu10uegPvh8dP1ReHeDrAgMB - AAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV - HQ4EFgQUa57IILbkKZWeXJJRgQDqoRdmZhcwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud - EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR - MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50 - Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG - CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB - LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYD - VR0RBB0wG4IZc2hpYmJvbGV0aC5lZGdlaGlsbC5hYy51azANBgkqhkiG9w0BAQUF - AAOCAQEAJ1aYSHILz1s8FOUJ8CyMaY6SJ51sIDsUR/CzifMmTaYi/tWoTVO+GQWg - yZJnChdXnQPRXs2H24F7HXGERAlLVy52Iu1S3ki7QaAbHz2/RtVcclrhepZAgMAe - 0MXVBU6ZQmx5GLXr54lmU9eZqttIAJF0Z4yQJUVWsJG/1Y9zhabO2xwqZGAZNvdR - un+tHnO3jqbRxuhvqKQRWH3hTxOQykP3HN8cMvy5zKhz/7Sc0Mub+1RRMo8aIx/V - xn4HkrUz5OwdKNj8DIn8uLlo3BCRPqo2J/ar4yAyNFbG0bBj20vNsgM8MxTWQg1o - NovUGgpJ3goRRkkfWFQ2MkKl4od7aQ== - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/> <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> |