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/auth.chimie-paristech.fr-idp-saml2-metadata.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml')
| -rw-r--r-- | swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml index 71423022..e34d7bb0 100644 --- a/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml +++ b/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml @@ -20,6 +20,30 @@ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> <ds:X509Certificate> + MIIC+TCCAeGgAwIBAgIJAJmcv9A/+nY6MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV +BAMMCHdob2NhcmVzMB4XDTE1MDcyNzA5MjYzNFoXDTI1MDcyNDA5MjYzNFowEzER +MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDb9zK81GuZJ/4TX0AalLD46F8+lcmfXc3Y5ccE2ZctCXVmeRUcnHXIr4jFJRQ3 +8AJ/g8A8zcsTYuDbhAg7Yd2vqmSSGGf9EETNn45NluBhfdtVTOKTXYyv+aY2RZKV +iqpWzz5i134rXXy61xLOcC0ci74K8PbwkfviMwYlnNNzFMBRIFOLTTFKgdDtjcE5 +Ie5oZPS4j5Tx0dYC3T2yhCWA7k0kc1VF/7Q9tF2+9msXHkGBMDOWoaKy6QKi6CHK +viEFYBd5U2PpSWQhqmcIBzIelQ2J3XIcoeyg/85tnN/s0+ZsADjJmzsOFVtAMYqI +Ry+75rqt+CLhs2RLXEFMkkTzAgMBAAGjUDBOMB0GA1UdDgQWBBRAoB5K4Z/Gm1zk +WtY9P638mmAeGjAfBgNVHSMEGDAWgBRAoB5K4Z/Gm1zkWtY9P638mmAeGjAMBgNV +HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVYVLSftwjAw0CyOcH8QXxjQmm +I/bQpPnAb6UDktX8zIqDfl3gZNa2oqMARcAgN/hBReqFpWQIUdsaJlePCxnWyxjP +aF3rWvXt47VoAABO9C3CdB5IoP65+GPbTNUQG0xFvrKFg4/Dw0/LyGf1I92cLl17 +GwtPeH74WWUS3211Vj/I5sgWqxWn7fDCA6uaEUEvFXlM9IVEOFfNhH1X+uJInXvG +ydZRy1PJDov/EFcatxt2v0DTIuqmtqTKi+luC1Zf5HdqV7d3EH76JeXcrvUGc8sa +qyA+HoSIue07UW2+enWOYUPVdkGqJ2+aSWgdYiwY825Q+GWXN7qSuOwGIXeg + </ds:X509Certificate> + </ds:X509Data> + </ds:KeyInfo> + </md:KeyDescriptor> + <md:KeyDescriptor use="signing"> + <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:X509Data> + <ds:X509Certificate> MIIC+TCCAeGgAwIBAgIJAMZ6vEXbndNaMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV BAMMCHdob2NhcmVzMB4XDTE1MDMyNDEzMTQzMFoXDTI1MDMyMTEzMTQzMFowEzER MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB @@ -40,30 +64,6 @@ gfR+hAVdryNm7EwlyO/nkqxhil2SSwTWyZi7YLmScmmyefERLhWt3uEtxBep </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIC+TCCAeGgAwIBAgIJAL+BQHJtGb0jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV -BAMMCHdob2NhcmVzMB4XDTE1MDIwNDEwMDQzN1oXDTI1MDIwMTEwMDQzN1owEzER -MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQCkZ2KuLbuBdCKcDN9yAR/+RFajz85DENz+F8c7JGEUpUdCl3e8Lz5+QxC1D+rn -3D4qrYozrsk+NcOa7IqC/sT0cmvWMpRaA/qCXpC4di8z+wsuUT9DSuAQu5XhXgz8 -gHXktqAT/qgmIo29Ofv0hNl1pi+TblnFGS6thfvRlmJ1gLGi9AMVickS7fgijSrq -xZXYzUV7gqIenvftzyjD1axcHoF38gofLmyIpcTqCNpoJ1gstEJRCfzK+WRnBKlW -XiDnMMpoupUPM8zU730aB13qY3BftPN1ZigwdVJipe9MGkXF/ZN5v/ofCytzQWCm -zRBp8eSYKFxjdaDlhfUFBXcxAgMBAAGjUDBOMB0GA1UdDgQWBBSbnTR565qjMG81 -RyVzrUZFBlZYSTAfBgNVHSMEGDAWgBSbnTR565qjMG81RyVzrUZFBlZYSTAMBgNV -HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBszIrhKOaT+2nPbOWo61o1FsGL -K8XWHNs0q1PZUqAqt7TUvOjSmOqwafWVt+fRtN0qh1+8NoLcxVeAHAY0vudPeX+T -2Sgj8LzDkSl5XssO2f9oUApZFgI2ctL74RpMLoPuhjQxJAv2sMxA52EFbarGLFfa -7xbnuvP7wIHGbLfk9W8fWC/dJOkSaW0ysDh8ZIrJ7NeeymOxxZg1SnJ7q/51nKIA -w8KIXJN0uLhGRREKNPFi76EzYueFntZ10zVmIxLcB1stQHt/uFCA8pP8z/7Wlg9k -w82nDsQe1PSSeiiAhiTWSLTnzMyk7AofMUC2+jxRFaWTUSGZVQpGIbfMeJ/n - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </md:KeyDescriptor> <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat> <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.chimie-paristech.fr/idp/saml2/sso"/> |