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

Conflicts:
	swamid-sp-2.0.mxml

2 files changed, 74 insertions, 0 deletions

diff --git a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
new file mode 100644
index 00000000..b9422621
--- /dev/null
+++ b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp2.test.umu.se/saml2/idp/metadata.php">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</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>MIIEeDCCA2CgAwIBAgIQSNslvGdmCXnbM5xzWOyrwTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDkwMTAwMDAwMFoXDTEzMDgzMTIzNTk1OVowUzELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDjAMBgNVBAsTBVVNREFDMRkwFwYDVQQDExBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqnsLBvs8DxJffl1zqULjBc1a+c1+mH+eW2BgUxNOG9FJCZqWAJFO8T4m3c1kO9VSQRSFqCMhQd08bfzySevDwgjX3+mR0UfJbtvcCLujDbSnE/1KgMv9EWcqzqyHsw8sL4ShG21pKaCjlP7Abq9T1flRixM+y47LEqnMlHOPKzNG4+366YzKIudsqNeiqwwAmEE4FZEwooBj8paWl800tNL4fUc7Y4sBxfs3j9e0h3sr32LRhQCL8wAa3OrRmoBrbEp/QDygQZ/XE+cjgbDSPzV/Ii4av4CF8OU+lYysrIZMDkTWjbXwkofm7HwbWgb+ukGO4RQdlf1gTG3pn15fQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBRq/M6MhWNHffNKe9OpmRL57m17MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGlkcDIudGVzdC51bXUuc2UwDQYJKoZIhvcNAQEFBQADggEBALNp2cyl51WNMXfW6YKwmZ6uOu07sGb5ONvteQ8L3qw8bN5ftBiGGi4LeckZj1K2/ql6roW2AeBdH2ZbsSPzfbgZUGVvZMqm0t/Ty24bhAcBtGmJd8oxDH5z8EwMA3Ko5y/n3Mxgn4kjwmDAuF44aVQG8s7Hh9eVvkQyD81ABpUACj+iqs1ynACdQAk2/As4zsCE0iaew/NQ52R7awPB5KitXABpiaj5pDTEsMVRuSKnTErLNTNE9gE0eeuN8bGsU3Hj7ndohqt8bSQLapIHU8odY52Ekjaq8L4etnipjTxrvZqu5TSskrkb9uOViUWND9DB1fKmTUaAeKWlOS/B0X0=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.test.umu.se/saml2/idp/ArtifactResolutionService.php" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.test.umu.se/saml2/idp/SingleLogoutService.php"/>
+    <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://idp2.test.umu.se/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
+    <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (New)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (Ny)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Datordrift</md:SurName>
+    <md:EmailAddress>datordrift@umdac.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/uninett-box-idp.nordu.net.xml b/swamid-2.0/uninett-box-idp.nordu.net.xml
new file mode 100644
index 00000000..f2deee6b
--- /dev/null
+++ b/swamid-2.0/uninett-box-idp.nordu.net.xml
@@ -0,0 +1,29 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uninett-box-idp.nordu.net/simplesaml/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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uninett-box-idp.nordu.net/simplesaml/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://uninett-box-idp.nordu.net/simplesaml/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://uninett-box-idp.nordu.net/simplesaml/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://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NORDUNet</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>