summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-05-23 11:21:06 +0200
committerLeif Johansson <leifj@sunet.se>2013-05-23 11:21:06 +0200
commit2967233980ec95eaea5ca8385c5e0a62b29ddb91 (patch)
tree8af8e09e035714a6360bd1d996335440d2a99461
parent2f8226220610df3394f4fbbe9a9cb869d365d46c (diff)
parent264568bd3d00a6618847955dc2e9662cb4b58abc (diff)
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Diffstat
-rw-r--r--swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml45
-rw-r--r--swamid-2.0/xenosmilus.umdc.umu.se-8086-coc-sp.xml4
-rw-r--r--swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml4
-rw-r--r--swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml4
-rw-r--r--swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml8
-rw-r--r--swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml8
-rw-r--r--swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml8
-rw-r--r--swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml12
-rw-r--r--swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml4
-rw-r--r--swamid-testing-idp-1.0.mxml1
10 files changed, 59 insertions, 39 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/xenosmilus.umdc.umu.se-8086-coc-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-coc-sp.xml
index d331db0b..4fa441a8 100644
--- a/swamid-2.0/xenosmilus.umdc.umu.se-8086-coc-sp.xml
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-coc-sp.xml
@@ -9,9 +9,7 @@
<ns0:Extensions>
<ns1:EntityAttributes>
<ns2:Attribute Name="http://macedir.org/entity-category">
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.edugain.org/dataprotection/coc-eu-01-draft
- </ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.edugain.org/dataprotection/coc-eu-01-draft</ns2:AttributeValue>
</ns2:Attribute>
</ns1:EntityAttributes>
</ns0:Extensions>
diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml
index a6a71a94..3522a5d4 100644
--- a/swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml
@@ -9,9 +9,7 @@
<ns0:Extensions>
<ns1:EntityAttributes>
<ns2:Attribute Name="http://macedir.org/entity-category">
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/nren-service
- </ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
</ns2:Attribute>
</ns1:EntityAttributes>
</ns0:Extensions>
diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml
index 254eabb4..cc63784c 100644
--- a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml
@@ -9,9 +9,7 @@
<ns0:Extensions>
<ns1:EntityAttributes>
<ns2:Attribute Name="http://macedir.org/entity-category">
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/research-and-education
- </ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
</ns2:Attribute>
</ns1:EntityAttributes>
</ns0:Extensions>
diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml
index 69acc314..ae5af755 100644
--- a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml
@@ -9,12 +9,8 @@
<ns0:Extensions>
<ns1:EntityAttributes>
<ns2:Attribute Name="http://macedir.org/entity-category">
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/research-and-education
- </ns2:AttributeValue>
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/eu-adequate-protection
- </ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue>
</ns2:Attribute>
</ns1:EntityAttributes>
</ns0:Extensions>
diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml
index fa610631..a482ebca 100644
--- a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml
@@ -9,12 +9,8 @@
<ns0:Extensions>
<ns1:EntityAttributes>
<ns2:Attribute Name="http://macedir.org/entity-category">
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/research-and-education
- </ns2:AttributeValue>
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/hei-service
- </ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
</ns2:Attribute>
</ns1:EntityAttributes>
</ns0:Extensions>
diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml
index c43c9d7e..2eb8b25b 100644
--- a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml
@@ -9,12 +9,8 @@
<ns0:Extensions>
<ns1:EntityAttributes>
<ns2:Attribute Name="http://macedir.org/entity-category">
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/research-and-education
- </ns2:AttributeValue>
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/nren-service
- </ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
</ns2:Attribute>
</ns1:EntityAttributes>
</ns0:Extensions>
diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml
index 411f3e18..806ce07f 100644
--- a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml
@@ -9,15 +9,9 @@
<ns0:Extensions>
<ns1:EntityAttributes>
<ns2:Attribute Name="http://macedir.org/entity-category">
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/research-and-education
- </ns2:AttributeValue>
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/hei-service
- </ns2:AttributeValue>
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/sfs-1993-1153
- </ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
</ns2:Attribute>
</ns1:EntityAttributes>
</ns0:Extensions>
diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml
index 91195a14..c73490be 100644
--- a/swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml
@@ -9,9 +9,7 @@
<ns0:Extensions>
<ns1:EntityAttributes>
<ns2:Attribute Name="http://macedir.org/entity-category">
- <ns2:AttributeValue xsi:type="xs:string">
- http://www.swamid.se/category/sfs-1993-1153
- </ns2:AttributeValue>
+ <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
</ns2:Attribute>
</ns1:EntityAttributes>
</ns0:Extensions>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index af1175e3..f4d2fa6d 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -139,4 +139,5 @@
<xi:include href="swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml"/>
<xi:include href="swamid-2.0/idp2-test.slu.se.xml"/>
<xi:include href="swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml"/>
+ <xi:include href="swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml"/>
</EntitiesDescriptor>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 10:18:53 +0000