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

1 files changed, 90 insertions, 90 deletions

diff --git a/swamid-1.0/account.liu.se.xml b/swamid-1.0/account.liu.se.xml
index 69438b3a..56763b36 100644
--- a/swamid-1.0/account.liu.se.xml
+++ b/swamid-1.0/account.liu.se.xml
@@ -1,90 +1,90 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://account.liu.se/shibboleth-sp">

-  <md:SPSSODescriptor 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:KeyDescriptor use="signing">

-      <ds:KeyInfo>

-        <ds:KeyName>account.liu.se</ds:KeyName>

-        <ds:X509Data>

-          <ds:X509SubjectName>CN=account.liu.se</ds:X509SubjectName>

-          <ds:X509Certificate>

-MIIDFzCCAf+gAwIBAgIJAJE6W/GYfYV8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV

-BAMTDmFjY291bnQubGl1LnNlMB4XDTExMTIxNTE1MDA1MVoXDTIxMTIxMjE1MDA1

-MVowGTEXMBUGA1UEAxMOYWNjb3VudC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA

-A4IBDwAwggEKAoIBAQC54kD9+4WlO7e8EgClxfjujUETGlRTB84iz6MRScEY4ugM

-48M441l8CM850y1iWWVRM/th49vK8mAURCeUsHJ1dfxD1Adh5MWrsFXPo2UXEzac

-UhKIXYD22Do8pBFEAI0u9+/YcxySIt4KhcXaPthlvTScOrAxNRqSOFBPzFMgPumQ

-yb6i+8kADTQU72Ad6d+xfJBN9Rc24Yy/l0XGM4GctIGs5W8lSJ67aaaDxbgf8btf

-NOGHprsf+JLxFqbLTitF9+SJcxCPc2OWRavfP58km5SxSi71hB/46Emsd2sa/q3k

-wgcX95I7xf4gtWmZjCp5vdXqCFThQOZBttlc8embAgMBAAGjYjBgMD8GA1UdEQQ4

-MDaCDmFjY291bnQubGl1LnNlhiRodHRwczovL2FjY291bnQubGl1LnNlL3NoaWJi

-b2xldGgtc3AwHQYDVR0OBBYEFPv4FgWJUwm6PhyMBm71+zlKKigPMA0GCSqGSIb3

-DQEBBQUAA4IBAQAe9SVnBilv4xxCohBBYa3ovoOj2G3ULiaavJ41IKe8OmzNEjx/

-dpBdtag4bK9ZmpTxF4TN/JbD4fI73M3kj4T29BlLsAggmOIjN0c89KfgbSommSt2

-ccx/lz9XSsxbxNwFy/1SIlgALjpTdJahy031x4W9Rydos1sBIq04bulSpjyfuWfZ

-D/Qn4x1CAkjhi5IQFugKiBM8UXiWf8jqowj69gblHE0Vboy6LjWwAukN6FhPENTI

-CP6HXDWqslCprTd/jZgMGAOpLsCTNIOwicpOR/R2OuV2ZEol6aSJAFw/fIqsPCLJ

-4d/qcTqO06jfZ8yC2PJZgOOkUmNRsIUAk2if

-          </ds:X509Certificate>

-        </ds:X509Data>

-      </ds:KeyInfo>

-    </md:KeyDescriptor>

-    <md:KeyDescriptor use="encryption">

-      <ds:KeyInfo>

-        <ds:KeyName>account.liu.se</ds:KeyName>

-        <ds:X509Data>

-          <ds:X509SubjectName>CN=account.liu.se</ds:X509SubjectName>

-          <ds:X509Certificate>

-MIIDFzCCAf+gAwIBAgIJAJE6W/GYfYV8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV

-BAMTDmFjY291bnQubGl1LnNlMB4XDTExMTIxNTE1MDA1MVoXDTIxMTIxMjE1MDA1

-MVowGTEXMBUGA1UEAxMOYWNjb3VudC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA

-A4IBDwAwggEKAoIBAQC54kD9+4WlO7e8EgClxfjujUETGlRTB84iz6MRScEY4ugM

-48M441l8CM850y1iWWVRM/th49vK8mAURCeUsHJ1dfxD1Adh5MWrsFXPo2UXEzac

-UhKIXYD22Do8pBFEAI0u9+/YcxySIt4KhcXaPthlvTScOrAxNRqSOFBPzFMgPumQ

-yb6i+8kADTQU72Ad6d+xfJBN9Rc24Yy/l0XGM4GctIGs5W8lSJ67aaaDxbgf8btf

-NOGHprsf+JLxFqbLTitF9+SJcxCPc2OWRavfP58km5SxSi71hB/46Emsd2sa/q3k

-wgcX95I7xf4gtWmZjCp5vdXqCFThQOZBttlc8embAgMBAAGjYjBgMD8GA1UdEQQ4

-MDaCDmFjY291bnQubGl1LnNlhiRodHRwczovL2FjY291bnQubGl1LnNlL3NoaWJi

-b2xldGgtc3AwHQYDVR0OBBYEFPv4FgWJUwm6PhyMBm71+zlKKigPMA0GCSqGSIb3

-DQEBBQUAA4IBAQAe9SVnBilv4xxCohBBYa3ovoOj2G3ULiaavJ41IKe8OmzNEjx/

-dpBdtag4bK9ZmpTxF4TN/JbD4fI73M3kj4T29BlLsAggmOIjN0c89KfgbSommSt2

-ccx/lz9XSsxbxNwFy/1SIlgALjpTdJahy031x4W9Rydos1sBIq04bulSpjyfuWfZ

-D/Qn4x1CAkjhi5IQFugKiBM8UXiWf8jqowj69gblHE0Vboy6LjWwAukN6FhPENTI

-CP6HXDWqslCprTd/jZgMGAOpLsCTNIOwicpOR/R2OuV2ZEol6aSJAFw/fIqsPCLJ

-4d/qcTqO06jfZ8yC2PJZgOOkUmNRsIUAk2if

-          </ds:X509Certificate>

-        </ds:X509Data>

-      </ds:KeyInfo>

-    </md:KeyDescriptor>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.liu.se/Shibboleth.sso/SLO/SOAP"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.liu.se/Shibboleth.sso/SLO/Redirect"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/SLO/POST"/>

-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/SLO/Artifact"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.liu.se/Shibboleth.sso/NIM/SOAP"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.liu.se/Shibboleth.sso/NIM/Redirect"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/NIM/POST"/>

-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/NIM/Artifact"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/SAML2/POST" index="1"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account.liu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.liu.se/Shibboleth.sso/SAML2/ECP" index="4"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.liu.se/Shibboleth.sso/SAML/POST" index="5"/>

-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>

-  </md:SPSSODescriptor>

-  <md:Organization>

-    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>

-    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet</md:OrganizationDisplayName>

-    <md:OrganizationURL xml:lang="sv">http://www.liu.se/?l=sv</md:OrganizationURL>

-    <md:OrganizationURL xml:lang="en">http://www.liu.se/?l=en</md:OrganizationURL>

-  </md:Organization>

-  <md:ContactPerson contactType="administrative">

-    <md:SurName>LiU-IT SAML admins</md:SurName>

-    <md:EmailAddress>saml-admins@it.liu.se</md:EmailAddress>

-  </md:ContactPerson>

-  <md:ContactPerson contactType="support">

-    <md:SurName>LiU-IT Helpdesk</md:SurName>

-    <md:EmailAddress>helpdesk@liu.se</md:EmailAddress>

-  </md:ContactPerson>

-  <md:ContactPerson contactType="technical">

-    <md:SurName>LiU-IT SAML admins</md:SurName>

-    <md:EmailAddress>saml-admins@it.liu.se</md:EmailAddress>

-  </md:ContactPerson>

-</md:EntityDescriptor>

+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://account.liu.se/shibboleth-sp">
+  <md:SPSSODescriptor 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:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>account.liu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=account.liu.se</ds:X509SubjectName>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIJAJE6W/GYfYV8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmFjY291bnQubGl1LnNlMB4XDTExMTIxNTE1MDA1MVoXDTIxMTIxMjE1MDA1
+MVowGTEXMBUGA1UEAxMOYWNjb3VudC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC54kD9+4WlO7e8EgClxfjujUETGlRTB84iz6MRScEY4ugM
+48M441l8CM850y1iWWVRM/th49vK8mAURCeUsHJ1dfxD1Adh5MWrsFXPo2UXEzac
+UhKIXYD22Do8pBFEAI0u9+/YcxySIt4KhcXaPthlvTScOrAxNRqSOFBPzFMgPumQ
+yb6i+8kADTQU72Ad6d+xfJBN9Rc24Yy/l0XGM4GctIGs5W8lSJ67aaaDxbgf8btf
+NOGHprsf+JLxFqbLTitF9+SJcxCPc2OWRavfP58km5SxSi71hB/46Emsd2sa/q3k
+wgcX95I7xf4gtWmZjCp5vdXqCFThQOZBttlc8embAgMBAAGjYjBgMD8GA1UdEQQ4
+MDaCDmFjY291bnQubGl1LnNlhiRodHRwczovL2FjY291bnQubGl1LnNlL3NoaWJi
+b2xldGgtc3AwHQYDVR0OBBYEFPv4FgWJUwm6PhyMBm71+zlKKigPMA0GCSqGSIb3
+DQEBBQUAA4IBAQAe9SVnBilv4xxCohBBYa3ovoOj2G3ULiaavJ41IKe8OmzNEjx/
+dpBdtag4bK9ZmpTxF4TN/JbD4fI73M3kj4T29BlLsAggmOIjN0c89KfgbSommSt2
+ccx/lz9XSsxbxNwFy/1SIlgALjpTdJahy031x4W9Rydos1sBIq04bulSpjyfuWfZ
+D/Qn4x1CAkjhi5IQFugKiBM8UXiWf8jqowj69gblHE0Vboy6LjWwAukN6FhPENTI
+CP6HXDWqslCprTd/jZgMGAOpLsCTNIOwicpOR/R2OuV2ZEol6aSJAFw/fIqsPCLJ
+4d/qcTqO06jfZ8yC2PJZgOOkUmNRsIUAk2if
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>account.liu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=account.liu.se</ds:X509SubjectName>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIJAJE6W/GYfYV8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmFjY291bnQubGl1LnNlMB4XDTExMTIxNTE1MDA1MVoXDTIxMTIxMjE1MDA1
+MVowGTEXMBUGA1UEAxMOYWNjb3VudC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC54kD9+4WlO7e8EgClxfjujUETGlRTB84iz6MRScEY4ugM
+48M441l8CM850y1iWWVRM/th49vK8mAURCeUsHJ1dfxD1Adh5MWrsFXPo2UXEzac
+UhKIXYD22Do8pBFEAI0u9+/YcxySIt4KhcXaPthlvTScOrAxNRqSOFBPzFMgPumQ
+yb6i+8kADTQU72Ad6d+xfJBN9Rc24Yy/l0XGM4GctIGs5W8lSJ67aaaDxbgf8btf
+NOGHprsf+JLxFqbLTitF9+SJcxCPc2OWRavfP58km5SxSi71hB/46Emsd2sa/q3k
+wgcX95I7xf4gtWmZjCp5vdXqCFThQOZBttlc8embAgMBAAGjYjBgMD8GA1UdEQQ4
+MDaCDmFjY291bnQubGl1LnNlhiRodHRwczovL2FjY291bnQubGl1LnNlL3NoaWJi
+b2xldGgtc3AwHQYDVR0OBBYEFPv4FgWJUwm6PhyMBm71+zlKKigPMA0GCSqGSIb3
+DQEBBQUAA4IBAQAe9SVnBilv4xxCohBBYa3ovoOj2G3ULiaavJ41IKe8OmzNEjx/
+dpBdtag4bK9ZmpTxF4TN/JbD4fI73M3kj4T29BlLsAggmOIjN0c89KfgbSommSt2
+ccx/lz9XSsxbxNwFy/1SIlgALjpTdJahy031x4W9Rydos1sBIq04bulSpjyfuWfZ
+D/Qn4x1CAkjhi5IQFugKiBM8UXiWf8jqowj69gblHE0Vboy6LjWwAukN6FhPENTI
+CP6HXDWqslCprTd/jZgMGAOpLsCTNIOwicpOR/R2OuV2ZEol6aSJAFw/fIqsPCLJ
+4d/qcTqO06jfZ8yC2PJZgOOkUmNRsIUAk2if
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.liu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.liu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.liu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.liu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.liu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account.liu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.liu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.liu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.liu.se/?l=sv</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.liu.se/?l=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>LiU-IT SAML admins</md:SurName>
+    <md:EmailAddress>saml-admins@it.liu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>LiU-IT Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk@liu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>LiU-IT SAML admins</md:SurName>
+    <md:EmailAddress>saml-admins@it.liu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>