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

Conflicts:
	swamid-sp-2.0.mxml

1 files changed, 34 insertions, 0 deletions

diff --git a/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..a99859be
--- /dev/null
+++ b/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://imogen.surfnet.nl/proxy/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SURFconext test proxy</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bas</md:GivenName>
+    <md:SurName>Zoetekouw</md:SurName>
+    <md:EmailAddress>bas.zoetekouw@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>