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

1 files changed, 46 insertions, 19 deletions

diff --git a/swamid-1.0/www07test.sub.su.se.xml b/swamid-1.0/www07test.sub.su.se.xml
index 4bf385ce..4eafbc96 100644
--- a/swamid-1.0/www07test.sub.su.se.xml
+++ b/swamid-1.0/www07test.sub.su.se.xml
@@ -1,8 +1,13 @@
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www07test.sub.su.se" xml:base="swamid-1.0/www07test.sub.su.se.xml">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6c1ab2178fa1fbb957db96e24042d64a" entityID="https://www07test.sub.su.se">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0: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:KeyName>swamid</ds:KeyName>
+        <ds:KeyName>www07test.sub.su.se</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=www07test.sub.su.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIB5TCCAU6gAwIBAgIJAMMRnP48jAtqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3d3dzA3dGVzdC5zdWIuc3Uuc2UwHhcNMDkxMjA4MTAyMjMzWhcNMTIxMjA3
 MTAyMjMzWjAeMRwwGgYDVQQDExN3d3cwN3Rlc3Quc3ViLnN1LnNlMIGfMA0GCSqG
@@ -13,21 +18,43 @@ Yma7NwIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsG
 AQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAKgR4QcvuxFjM3GXE1iyl8ehd5VkQv7x
 bi95mXj6IdK6mzg5QwofBSltHWNKv/AHpPuBzWd0LjCstdWeJXOCoEJe7twLsFGG
 kU+Y2c688RcV0cUVNvcympR5pYNU7ky0uPd/RCV4vnZ9DQqAKCcB/3wZ2cbfyBIR
-gG19ycA9AsUe</ds:X509Certificate>
+gG19ycA9AsUe
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <GivenName>Conny</GivenName>
-    <SurName>Richardson</SurName>
-    <EmailAddress>conny.richardson@sub.su.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>swamid</ds:KeyName>
+        <ds:KeyName>www07test.sub.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www07test.sub.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIB5TCCAU6gAwIBAgIJAMMRnP48jAtqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3d3dzA3dGVzdC5zdWIuc3Uuc2UwHhcNMDkxMjA4MTAyMjMzWhcNMTIxMjA3
+MTAyMjMzWjAeMRwwGgYDVQQDExN3d3cwN3Rlc3Quc3ViLnN1LnNlMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQC9adDbmgkldLxg7+sU4Yh7vgHpMpCWJx3PJG4z
+1oqyG2AdYjjWeNkXpindtpadS7KaVcV+Zoc1PzqLOdp89gX5J84sox/XzCPu/RAZ
+lxtruQxRXbkYYTQYtOJaevl6eaPWsR1r2x/RQ8IW9iNOAiuw3D1CudvvphPi0M4p
+Yma7NwIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsG
+AQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAKgR4QcvuxFjM3GXE1iyl8ehd5VkQv7x
+bi95mXj6IdK6mzg5QwofBSltHWNKv/AHpPuBzWd0LjCstdWeJXOCoEJe7twLsFGG
+kU+Y2c688RcV0cUVNvcympR5pYNU7ky0uPd/RCV4vnZ9DQqAKCcB/3wZ2cbfyBIR
+gG19ycA9AsUe
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www07test.sub.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www07test.sub.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www07test.sub.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www07test.sub.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www07test.sub.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www07test.sub.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file