Merge branch 'master' of md-master.swamid.se:swamid-metadata

1 files changed, 0 insertions, 115 deletions

diff --git a/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml b/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml
deleted file mode 100644
index 080a79c0..00000000
--- a/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.surfnetlabs.nl/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:37:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="1" 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">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SURFnetlabs Wiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nl">SURFnetlabs Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SURFnetlabs Wiki</mdui:Description>
-        <mdui:Description xml:lang="nl">SURFnetlabs Wiki</mdui:Description>
-        <mdui:Logo height="300" width="500" xml:lang="en">https://static.surfconext.nl/media/sp/SURFnetdienst.png</mdui:Logo>
-        <mdui:Logo height="300" width="500" xml:lang="nl">https://static.surfconext.nl/media/sp/SURFnetdienst.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">wiki surfnet surfnetlabs</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">wiki surfnet surfnetlabs</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://wiki.surfnetlabs.nl</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="nl">https://wiki.surfnetlabs.nl</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.surfnet.nl/Documents/best_practice_privacy_SURFfederatie_SURFconext_EN.pdf</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="nl">http://www.surfnet.nl/Documents/best_practice_privacy_SURFfederatie_SURFconext_NL.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.surfnetlabs.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.surfnetlabs.nl,OU=Services,O=SURFnet B.V.,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEfjCCA2agAwIBAgIRAPMC2j8GrCWf8rRjWzHCHh8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDAxMjUwMDAwMDBaFw0xMzAxMjQyMzU5NTlaMFUxCzAJBgNV
-BAYTAk5MMRUwEwYDVQQKEwxTVVJGbmV0IEIuVi4xETAPBgNVBAsTCFNlcnZpY2Vz
-MRwwGgYDVQQDExN3aWtpLnN1cmZuZXRsYWJzLm5sMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwy0KxkE03WH+r/G3yn4QLP7vEIXaslJXS2vD3Ba8vWIu
-MSvdtRrimSnwGAo8C3Dn4NwsRj8hmZN6KO1Rf22M5QEPAmskNdBlZrv4AmMOpqle
-YkJ16sp6GEX6yjrbzWlzl4GBE5K0DztjeBc+Uu+CUFWVrepGaj5Nic1mTprj2gRA
-Q5yUd16w91CG9WydPF5gqJ63xQAw1DwzUxjO3Ki7YHcNyJsmhzGOwD954UCLeAQ3
-xy+j02yx3WjzKkBcTJmb5WnzJnYNEqhI/s+Sur+ckm72iIfPSbcy8uP7LE0HGzwE
-SWXmo/Whxzm5WRvI8nVjZ2WQRXq+axWclAcf15yEjwIDAQABo4IBZjCCAWIwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLjh9r/BG1J6
-vyOl7kQ2uHFIXl9iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB4GA1UdEQQXMBWCE3dpa2ku
-c3VyZm5ldGxhYnMubmwwDQYJKoZIhvcNAQEFBQADggEBABbwQZuJ3HjsyZmHJDDE
-6aAbaMp6WLPPcihEl5VIHnV/ymBxEREol0dzXLFP8RJWAZHc7lMoD9M8t1UNpOD2
-Ix6r3nrM6UX8cP5Efp84ESkRETW3l5QWw/4+SoArsRRLZiNZ9hAeQFLQB5pODpNk
-sb3PYtEIZRq4nV4kP7T2zRGkllvIzoF/Z/Tf88Uxb8y7/d6q6sJx1kqZascmxBg7
-qieRAqjAtVENnmJFmUbp/6t5jLQ0zwqbsO4SHloodPjv5j3rkRzUBWcPQLvyyl6q
-LD1R7DW6m/DT9iQfZ11P3CV92ehsHFNqlGxakYH7S3ghv+dzcwWq53T8kTPaQaC6
-Fxw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SURFnetlabs Wiki</md:ServiceName>
-      <md:ServiceName xml:lang="nl">SURFnetlabs Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SURFnetlabs Wiki</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="nl">SURFnetlabs Wiki</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SURFnet B.V.</md:OrganizationName>
-    <md:OrganizationName xml:lang="nl">SURFnet B.V.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>