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/shibboleth2sp.brill.test.semantico.net-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml index dffc60a9..faf801c7 100644 --- a/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml +++ b/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml @@ -37,64 +37,6 @@ </ds:X509Data> </ds:KeyInfo> </KeyDescriptor> - <KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIID2TCCA0KgAwIBAgIDEAB/MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL - MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz - ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp - dHkwHhcNMTAwNzA4MTIxNTI5WhcNMTUwNzA3MTIxNTI5WjB2MQswCQYDVQQGEwJV - SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ - c2VtYW50aWNvMS8wLQYDVQQDEyZzaGliYm9sZXRoMnNwLmJyaWxsLnRlc3Quc2Vt - YW50aWNvLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG3jtkz - QfLlLf0PaYfXJvK2wFxKxxQQtUEamoSkj4hqEGtEOJ1fdZDOSexSRWtJ78+uSXor - RWhi8BSNK3l5Wpj/DkUQeedDDCmK71N0r7zpNLxSsGHC7oS/YKmUnAL7kprZydxx - QhlkeSkuQnzKY8zGRQHN09aNJB0kMTyWluVvqQeprMhZ8GREsyzDa3JXFrqJsm9h - MiQU3RqhG1zUh3/ZF/JLhHmJ86lg8qdDVOb9XFRqNm8egtYblzIJD8Xy0TUgba7t - G0+vKBUmSvTEO2nGyE1ASHNjAX2fjpoWaIphQT0Ljp5sMWyECk62c8VpwiwN4nhb - C95LYMbNp+pgjfMCAwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf - Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUETYeFc3g - b6aKmwTSh3GWsLvSaI8wgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJe - vjmhc6RxMG8xCzAJBgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcT - CEJyaWdodG9uMRIwEAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGlj - byBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAZWJ1 - q4bbc9sJWPIKdCOhMO7ZOXmhmLy2Fz/8zGRRIrzjD4hEFxfBRMnNhuxvcGdv6kNY - w97NvuBU1SebHu4e5lQFmCzTfri8mnA18Aes7a/XFCDIrv+uzHM3Xjph077RjIes - BxT33lxvsp2mnJhaeCweHAs12pOLwFLFrd/lN0g= - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <KeyDescriptor use="encryption"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIID2TCCA0KgAwIBAgIDEAB/MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL - MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz - ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp - dHkwHhcNMTAwNzA4MTIxNTI5WhcNMTUwNzA3MTIxNTI5WjB2MQswCQYDVQQGEwJV - SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ - c2VtYW50aWNvMS8wLQYDVQQDEyZzaGliYm9sZXRoMnNwLmJyaWxsLnRlc3Quc2Vt - YW50aWNvLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG3jtkz - QfLlLf0PaYfXJvK2wFxKxxQQtUEamoSkj4hqEGtEOJ1fdZDOSexSRWtJ78+uSXor - RWhi8BSNK3l5Wpj/DkUQeedDDCmK71N0r7zpNLxSsGHC7oS/YKmUnAL7kprZydxx - QhlkeSkuQnzKY8zGRQHN09aNJB0kMTyWluVvqQeprMhZ8GREsyzDa3JXFrqJsm9h - MiQU3RqhG1zUh3/ZF/JLhHmJ86lg8qdDVOb9XFRqNm8egtYblzIJD8Xy0TUgba7t - G0+vKBUmSvTEO2nGyE1ASHNjAX2fjpoWaIphQT0Ljp5sMWyECk62c8VpwiwN4nhb - C95LYMbNp+pgjfMCAwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf - Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUETYeFc3g - b6aKmwTSh3GWsLvSaI8wgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJe - vjmhc6RxMG8xCzAJBgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcT - CEJyaWdodG9uMRIwEAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGlj - byBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAZWJ1 - q4bbc9sJWPIKdCOhMO7ZOXmhmLy2Fz/8zGRRIrzjD4hEFxfBRMnNhuxvcGdv6kNY - w97NvuBU1SebHu4e5lQFmCzTfri8mnA18Aes7a/XFCDIrv+uzHM3Xjph077RjIes - BxT33lxvsp2mnJhaeCweHAs12pOLwFLFrd/lN0g= - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/Artifact/SOAP" index="1"/> <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/SOAP"/> <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/Redirect"/> |