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.brillonline.nl-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml | 73 |
1 files changed, 22 insertions, 51 deletions
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml index 662f6c69..011f85f4 100644 --- a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml +++ b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml @@ -7,60 +7,31 @@ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/> </Extensions> <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol"> - <KeyDescriptor use="signing"> + <KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> <ds:X509Certificate> - MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL - MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz - ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp - dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV - SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ - c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF - GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n - jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO - M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6 - DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r - eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR - kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg - R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1 - XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL - MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x - EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj - YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA - XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y - E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w - OsSkSoP6HZrPCOXMEAK23C8pxQ== - </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> - MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL - MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz - ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp - dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV - SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ - c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s - MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF - GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n - jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO - M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6 - DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r - eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR - kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg - R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1 - XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL - MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x - EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj - YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA - XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y - E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w - OsSkSoP6HZrPCOXMEAK23C8pxQ== + MIID1jCCAr6gAwIBAgIJANySKK7sPqq+MA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV + BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD + VQQKEwlzZW1hbnRpY28xJTAjBgNVBAMTHHNoaWJib2xldGgyc3AuYnJpbGxvbmxp + bmUubmwwHhcNMTUwNzMwMTAzNDI5WhcNMzUwNzI1MTAzNDI5WjBsMQswCQYDVQQG + EwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UE + ChMJc2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5l + Lm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzDGthKGzhqlGBQcB + u9c2+gPZvoL8QcIfYuz7gyMi1hs4ZQEK/mNwiM2wSbMcG44yvXPcDFSYiKmPtykJ + GXRMlSS2Q9O5F5eOnZU40sl4s6Va2oK6SyKA0RnFKwt9svLjHbmMbobQEB4hRdNX + Ju9YHL+ql33rAhCdmnDuBmtfPvgu0V6uqb1x5yXShYQdXwD0o6gaBXcxIfDZfCqw + ZLeV9XmdRAX5viX2tBp2B6CNT4uPPyhIdVJ6P299xfMwrkKD8+OxzgPn9wYxzq0J + vd7WwKFD4Z6waUHTbU2KLVcaCmEZz19K9xofDon1pi+GLUrQawf82mQKGHAhH8Jw + +L2tkwIDAQABo3sweTBYBgNVHREEUTBPghxzaGliYm9sZXRoMnNwLmJyaWxsb25s + aW5lLm5shi9odHRwczovL3NoaWJib2xldGgyc3AuYnJpbGxvbmxpbmUubmwvc2hp + YmJvbGV0aDAdBgNVHQ4EFgQUyOAI3XrlGiIPV0Tofnyk2xSjn1IwDQYJKoZIhvcN + AQEFBQADggEBAHyrsIjUUcOSIc5+zVKRH59MFbEjeYMPomEeJmFOxojwDlSbhZ4b + 2K2iTcCXlY8rtuuYLrWTLGyhJW+xWGRAJFJwD6F6WHJFEklMYeIAmlXKzCJJKuJn + rFzPjibYq2YafhbKn5N8k2QUJKOIhgg4FAWsGXLrcR/7W0LJCg5l2fPyDH/KbRzP + OgBYciKv5fbMr+vSM8LYJ9zAKYWsyg3yo6Hrf8RQKsn0ptaSOqJZf0W4mGlH3Ug5 + GUyHWM3Hk/NPMuV49u+GU/beegr/XVyLUTMj1EyxCPpXr5bShe1sZ73TVQ51b6am + uVOG89dvf99DIrLXGx9zxyM6HTWXTmaT/9A= </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> |