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/xperthr.co.uk-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml b/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml index 66b3e210..3cb857bc 100644 --- a/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml +++ b/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml @@ -41,37 +41,6 @@ </ds:X509Data> </ds:KeyInfo> </KeyDescriptor> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIEMTCCAxmgAwIBAgIRANJmy62dRlQsRbM9eBFfwaUwDQYJKoZIhvcNAQEFBQAw - SDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9u - MRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTAeFw0xMjA3MjUwNzM2NDFaFw0xNTA4 - MjYwOTAxMTZaMHExGDAWBgNVBAMUDyoueHBlcnRoci5jby51azEPMA0GA1UEBxMG - U3V0dG9uMQ8wDQYDVQQIEwZTdXJyZXkxCzAJBgNVBAYTAkdCMSYwJAYDVQQKEx1S - ZWVkIEJ1c2luZXNzIEluZm9ybWF0aW9uIEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD - ggEPADCCAQoCggEBAMgoLbdAtISqHU+dde46IYDoRyBmip0Mlgo/zLl/sg/gJlEr - bbhQTtOAFzzmS5E8H8gsCmz8gDu+oCoXfAMHN46AAG0jF/rked1kJRn9rYCTq04f - /rfVO/VBQ7zqQG4Vi9dcH6ujY6osH1VECtvjxxcM7ClAeK5TdLfF87+hX32HHreQ - W/BhmmeDSlr4uZA8zayUDC4XiTc4xV8TymY4+ugYCPX23x+h+O0WTp8I7mCpwvmm - 2YL+RFH27ic+nyM2fsX9HAtyLr9sRGajY0F4kDVPjg7F1/NY8q4NY6/gyvZBUrDg - zhYrvfuVSt0On8oNayiywOVvri8CA4OnNv85XocCAwEAAaOB7DCB6TAJBgNVHRME - AjAAMB0GA1UdDgQWBBRoBK5/7uoq1WJ2Un4zCuOYYWmKCjAfBgNVHSMEGDAWgBRC - MrYW+gT9/l1LesP990xAHVpDrzALBgNVHQ8EBAMCBaAwEwYDVR0lBAwwCgYIKwYB - BQUHAwEwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5j - b20vU1RDQS5jcmwwRAYDVR0gBD0wOzA5BgxghkgBhv1kAQECAwEwKTAnBggrBgEF - BQcCARYbaHR0cDovL3NzbC50cnVzdHdhdmUuY29tL0NBMA0GCSqGSIb3DQEBBQUA - A4IBAQBA3ueO9F9vI4eJb8trFi90caKoxvQ77Kwb5sOI1dQ8V8G4ZkzdDErZk0R2 - GoJNUBSisafG04hEeF67v+SwJLx7Ye7V+wVFgrl3ux6PvaBcwEmaI43cUSVHoHDm - M0EYhrObf103NP8ecuzf2gu15uQt8uxId0CJJRdkis+Mq7JMM1aI40lcKZtBZMC0 - k013yqpgBpqjDxGKgpWjzyI/uWDuXAQw58WP3MOSRUU/Um6cXwTKqjAatfrIrhf0 - Bp7+ojPob81sAJqxNbAGbXvZLGS0U/juaLi7aNje+DnqwUkQIpVnVtE5n2HLvkbh - qgB6j/wEdhppfAvFEntHvow73izn - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="1" isDefault="true"/> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="2"/> |