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/federatie.driestar-educatief.nl-adfs-services-trust.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml')
| -rw-r--r-- | swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml deleted file mode 100644 index 981a2434..00000000 --- a/swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.driestar-educatief.nl/adfs/services/trust"> - <md:Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z"> - <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy> - </mdrpi:RegistrationInfo> - </md:Extensions> - <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> - <md:Extensions> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="nl">Driestar Educatief</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Driestar Educatief</mdui:DisplayName> - <mdui:Description xml:lang="nl">Driestar Educatief</mdui:Description> - <mdui:Description xml:lang="en">Driestar Educatief</mdui:Description> - <mdui:Logo height="108" width="120">https://static.surfconext.nl/media/idp/driestar.png</mdui:Logo> - <mdui:Keywords xml:lang="nl">Driestar Educatief HBO</mdui:Keywords> - <mdui:Keywords xml:lang="en">Driestar Educatief HBO</mdui:Keywords> - </mdui:UIInfo> - </md:Extensions> - <md:KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </md:KeyDescriptor> - <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/ebc22074669e3e895bbb22bdf6d5c6da"/> - </md:IDPSSODescriptor> - <md:Organization> - <md:OrganizationName xml:lang="en">Driestar Educatief</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="en">Driestar Educatief</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">http://www.driestar-educatief.nl/</md:OrganizationURL> - </md:Organization> - <md:ContactPerson contactType="administrative"> - <md:GivenName>SURFconext support</md:GivenName> - <md:EmailAddress>support@surfconext.nl</md:EmailAddress> - </md:ContactPerson> - <md:ContactPerson contactType="technical"> - <md:GivenName>SURFconext support</md:GivenName> - <md:EmailAddress>support@surfconext.nl</md:EmailAddress> - </md:ContactPerson> - <md:ContactPerson contactType="support"> - <md:GivenName>SURFconext support</md:GivenName> - <md:EmailAddress>help@surfconext.nl</md:EmailAddress> - </md:ContactPerson> -</md:EntityDescriptor> |