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/cafe.ifrs.edu.br-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml | 92 |
1 files changed, 44 insertions, 48 deletions
diff --git a/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml index 26f14ce6..409f3929 100644 --- a/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml @@ -23,30 +23,28 @@ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> <ds:X509Certificate> - MIIEYjCCA0oCAQAwDQYJKoZIhvcNAQEFBQAwgfYxNjA0BgNVBAoTLUlGUlMgLSBJ -bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDE0MDIGA1UECxMr -RFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEoMCYG -CSqGSIb3DQEJARYZcGF1bG8ubWFjaGFkb0BpZnJzLmVkdS5icjEYMBYGA1UEBxMP -QmVudG8gR29uY2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG -A1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwHhcNMTUwNTA1MTYz -MTM4WhcNMTgwNTA0MTYzMTM4WjCB9jE2MDQGA1UEChMtSUZSUyAtIEluc3RpdHV0 -byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMTQwMgYDVQQLEytEVEkgLSBE -aXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMSgwJgYJKoZIhvcN -AQkBFhlwYXVsby5tYWNoYWRvQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9CZW50byBH -b25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC -UjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAM0co9o7TbTG3+n7PbHLIcqBE2s3awk3ZdCMavoU6/lE2gTh -lJPLw1zPRZ7oXNAu9CHdbsnyJMy/YNChyA+rfRYhbpTaT5g68DFu+9+QANr7BQac -rsxqsJhnyfooB+ZslPCw8nLelIla5UiaX1DiaCccQ2DXEnGTq7sH7si3RrZaRB5R -Wp2Ts7OHEYSYpDSNPTrGPQWJ6o1Ss9IVDd0WmCZJ6nYAjfAG/Y7nteCndfAP4TPL -QdFkBhlXk+YbYLVOifGMzqUOnufALseCNCj4C2jXhgRdD3td1GFSfzQJkSx+BPkR -ZxysbCgf4WlQc644MHjDSrcYsCIbwJ69cxjlcyUCAwEAATANBgkqhkiG9w0BAQUF -AAOCAQEAbEftNLMzu3ALu/7RlRp2JUr6az5dYxifpzUqp2/zVn8h46yEawYU+WAs -L2/j1JLb22XpfS114lTdK9cbgqvK29O5sHF6DAKFcZFTBscLWnpp6bUkXsl9EGzt -IU8XZ4OPhdpPj3VxpoYhkzUCtslV+cyr3R68x0UyOjwfDMYQrA29OV10Tsp9kc2u -zcLRGbpAgOg+4YL5zxJF+Vff3UxwxDiiQ003XmvpmGzcxTsf5VSNfiAwjFSlN6rX -Wlqsc3dicPAd8gPwmxiz4stoPj/8uhjpFXIuB+amkZ4aNwUlzuZWpGjj/CGY0LS8 -pfWfFxGKmUY3hiiTl5PDJimzekIzmQ== + MIIEADCCAugCAQAwDQYJKoZIhvcNAQEFBQAwgcUxNjA0BgNVBAoTLUlGUlMgLSBJ +bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMD +Q1BEMR8wHQYJKoZIhvcNAQkBFhBjYWZlQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9C +ZW50byBHb25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYD +VQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjAeFw0xNTA3MDcxODIx +MTFaFw0xODA3MDYxODIxMTFaMIHFMTYwNAYDVQQKEy1JRlJTIC0gSW5zdGl0dXRv +IEZlZGVyYWwgZG8gUmlvIEdyYW5kZSBkbyBTdWwxDDAKBgNVBAsTA0NQRDEfMB0G +CSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEYMBYGA1UEBxMPQmVudG8gR29u +Y2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIx +GTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDW0sT6IptdPSgeFZD82tHmfg5a2W3bmAqblRCtvZglNdLgpL5W +NJMcgolvbumWM709Hv8cX5y1vwCFByV4hrDReU5YEgsKWvA5Eovh5LntWK5euKd/ +yALTEOH3k4b+ktF7TPIwCfsIpY3wcaBdGIGtNaqAJq9Vbmms9KgNmLmNNGtk8LF6 +QLT1IuLj9uGJrvTTtrD9aBhj0qbWtLtBbE7zHCUiPCK4sqHZon1xzHbBNy2BpTCn +gclxri3xKElFqEpEiNfzSBfx8uicN1CYofKMMuMY2dHmGQeYl/oas3VVCo/CebR6 +E6a7MYZfQklnLYWh1UGwr3oUyuB+xF5SwL1rAgMBAAEwDQYJKoZIhvcNAQEFBQAD +ggEBAJszIng6ixxwRUsyMzHkpBuM6t9JsdfqHP3OtXQu3l2rru6Q1aatTA40H0sq ++ODSTIkvmbXrH1Sa0eobjwRCgIohzPxiK6xbxEnT/EnIBPoYNgJEXdfdM26Hi158 +d4ON/+NcLw2+WXtQJ3p1nyqpVP5ZDh+seCjYNGYCwm0Hv/X8MMoZ1X12ONwbDKzF +nJMHAVlQBn6KfZ5hnLHCM7AMGzbmvNguvBKSHgASBCCHSm2y0dOMy47ynr1P/Srh +iC7HCSCn/egq36udHpw14Zh1AW12yr0P5TWT0YY3Fony8MVpT6VO0W+lNwJ084DB +4PBfkm2ud0+t4T9K/ym4hghmfHQ= </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> @@ -69,30 +67,28 @@ pfWfFxGKmUY3hiiTl5PDJimzekIzmQ== <ds:X509Data> <ds:X509Certificate> -MIIEYjCCA0oCAQAwDQYJKoZIhvcNAQEFBQAwgfYxNjA0BgNVBAoTLUlGUlMgLSBJ -bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDE0MDIGA1UECxMr -RFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEoMCYG -CSqGSIb3DQEJARYZcGF1bG8ubWFjaGFkb0BpZnJzLmVkdS5icjEYMBYGA1UEBxMP -QmVudG8gR29uY2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG -A1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwHhcNMTUwNTA1MTYz -MTM4WhcNMTgwNTA0MTYzMTM4WjCB9jE2MDQGA1UEChMtSUZSUyAtIEluc3RpdHV0 -byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMTQwMgYDVQQLEytEVEkgLSBE -aXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMSgwJgYJKoZIhvcN -AQkBFhlwYXVsby5tYWNoYWRvQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9CZW50byBH -b25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJC -UjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAM0co9o7TbTG3+n7PbHLIcqBE2s3awk3ZdCMavoU6/lE2gTh -lJPLw1zPRZ7oXNAu9CHdbsnyJMy/YNChyA+rfRYhbpTaT5g68DFu+9+QANr7BQac -rsxqsJhnyfooB+ZslPCw8nLelIla5UiaX1DiaCccQ2DXEnGTq7sH7si3RrZaRB5R -Wp2Ts7OHEYSYpDSNPTrGPQWJ6o1Ss9IVDd0WmCZJ6nYAjfAG/Y7nteCndfAP4TPL -QdFkBhlXk+YbYLVOifGMzqUOnufALseCNCj4C2jXhgRdD3td1GFSfzQJkSx+BPkR -ZxysbCgf4WlQc644MHjDSrcYsCIbwJ69cxjlcyUCAwEAATANBgkqhkiG9w0BAQUF -AAOCAQEAbEftNLMzu3ALu/7RlRp2JUr6az5dYxifpzUqp2/zVn8h46yEawYU+WAs -L2/j1JLb22XpfS114lTdK9cbgqvK29O5sHF6DAKFcZFTBscLWnpp6bUkXsl9EGzt -IU8XZ4OPhdpPj3VxpoYhkzUCtslV+cyr3R68x0UyOjwfDMYQrA29OV10Tsp9kc2u -zcLRGbpAgOg+4YL5zxJF+Vff3UxwxDiiQ003XmvpmGzcxTsf5VSNfiAwjFSlN6rX -Wlqsc3dicPAd8gPwmxiz4stoPj/8uhjpFXIuB+amkZ4aNwUlzuZWpGjj/CGY0LS8 -pfWfFxGKmUY3hiiTl5PDJimzekIzmQ== +MIIEADCCAugCAQAwDQYJKoZIhvcNAQEFBQAwgcUxNjA0BgNVBAoTLUlGUlMgLSBJ +bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMD +Q1BEMR8wHQYJKoZIhvcNAQkBFhBjYWZlQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9C +ZW50byBHb25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYD +VQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjAeFw0xNTA3MDcxODIx +MTFaFw0xODA3MDYxODIxMTFaMIHFMTYwNAYDVQQKEy1JRlJTIC0gSW5zdGl0dXRv +IEZlZGVyYWwgZG8gUmlvIEdyYW5kZSBkbyBTdWwxDDAKBgNVBAsTA0NQRDEfMB0G +CSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEYMBYGA1UEBxMPQmVudG8gR29u +Y2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIx +GTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDW0sT6IptdPSgeFZD82tHmfg5a2W3bmAqblRCtvZglNdLgpL5W +NJMcgolvbumWM709Hv8cX5y1vwCFByV4hrDReU5YEgsKWvA5Eovh5LntWK5euKd/ +yALTEOH3k4b+ktF7TPIwCfsIpY3wcaBdGIGtNaqAJq9Vbmms9KgNmLmNNGtk8LF6 +QLT1IuLj9uGJrvTTtrD9aBhj0qbWtLtBbE7zHCUiPCK4sqHZon1xzHbBNy2BpTCn +gclxri3xKElFqEpEiNfzSBfx8uicN1CYofKMMuMY2dHmGQeYl/oas3VVCo/CebR6 +E6a7MYZfQklnLYWh1UGwr3oUyuB+xF5SwL1rAgMBAAEwDQYJKoZIhvcNAQEFBQAD +ggEBAJszIng6ixxwRUsyMzHkpBuM6t9JsdfqHP3OtXQu3l2rru6Q1aatTA40H0sq ++ODSTIkvmbXrH1Sa0eobjwRCgIohzPxiK6xbxEnT/EnIBPoYNgJEXdfdM26Hi158 +d4ON/+NcLw2+WXtQJ3p1nyqpVP5ZDh+seCjYNGYCwm0Hv/X8MMoZ1X12ONwbDKzF +nJMHAVlQBn6KfZ5hnLHCM7AMGzbmvNguvBKSHgASBCCHSm2y0dOMy47ynr1P/Srh +iC7HCSCn/egq36udHpw14Zh1AW12yr0P5TWT0YY3Fony8MVpT6VO0W+lNwJ084DB +4PBfkm2ud0+t4T9K/ym4hghmfHQ= </ds:X509Certificate> </ds:X509Data> |