summaryrefslogtreecommitdiff
path: root/swamid-1.0
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-06-12 12:26:49 +0200
committerLeif Johansson <leifj@sunet.se>2013-06-12 12:26:49 +0200
commit230f35233309627c29e3959d7b77a33171b46b7e (patch)
treefc6e1c10d44830c6fb7b86f40099cb6557cc1b89 /swamid-1.0
parentbb7b425b968dfaf2ca72409ed38fb4dcce6dffae (diff)
parentba27c31fc84d0bf2e8a74f25502fb8e1d9df8bd6 (diff)
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Diffstat (limited to 'swamid-1.0')
-rw-r--r--swamid-1.0/account.liu.se.xml180
-rw-r--r--swamid-1.0/downloads.channel8.msdn.com.xml90
-rw-r--r--swamid-1.0/e5.onthehub.com.xml126
-rw-r--r--swamid-1.0/idp.irf.se.xml236
-rw-r--r--swamid-1.0/livesrv.ex.vr.se.xml240
-rw-r--r--swamid-1.0/login.liu.se.xml290
-rw-r--r--swamid-1.0/lpw.ki.se.xml92
-rw-r--r--swamid-1.0/pingpong.chalmers.se.xml72
-rw-r--r--swamid-1.0/vmidgw3.miun.se.xml210
9 files changed, 768 insertions, 768 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>
diff --git a/swamid-1.0/downloads.channel8.msdn.com.xml b/swamid-1.0/downloads.channel8.msdn.com.xml
index 3d960d17..6d23e807 100644
--- a/swamid-1.0/downloads.channel8.msdn.com.xml
+++ b/swamid-1.0/downloads.channel8.msdn.com.xml
@@ -1,45 +1,45 @@
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
- <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 http://schemas.xmlsoap.org/ws/2003/07/secext" >
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>www.dreamspark.com</ds:KeyName>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIF+jCCBOKgAwIBAgIKLqDfHAAIAAGj6DANBgkqhkiG9w0BAQUFADCBizETMBEG CgmSJomT8ixkARkWA2NvbTEZMBcGCgmSJomT8ixkARkWCW1pY3Jvc29mdDEUMBIG CgmSJomT8ixkARkWBGNvcnAxFzAVBgoJkiaJk/IsZAEZFgdyZWRtb25kMSowKAYD VQQDEyFNaWNyb3NvZnQgU2VjdXJlIFNlcnZlciBBdXRob3JpdHkwHhcNMTAwNzMw MDAyMTA4WhcNMTEwNzMwMDAyMTA4WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK V2FzaGluZ3RvbjEQMA4GA1UEBxMHU2VhdHRsZTETMBEGA1UEChMKRmFzdCBUcmFj azEUMBIGA1UECxMLRHJlYW0gU3BhcmsxGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJr LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtsyFSuceS0RVGHD1Qbch DWIdIGfELS06JXkb6EJELGld5j4P50fGSqMXDcPIt3jHqjt9jnd5aqJP4Z5ROs5p hJ7fXtm56taeSVTfZSQRIzlVyaIG1QSKeqdlt6GWZrlV+Gy2cKAglMcKh5/y5ISP /TbQWeJtreT+Pi/Aj0IQcGUCAwEAAaOCAvAwggLsMAsGA1UdDwQEAwIEsDBEBgkq hkiG9w0BCQ8ENzA1MA4GCCqGSIb3DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwBwYF Kw4DAgcwCgYIKoZIhvcNAwcwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB MB0GA1UdDgQWBBT2xedjpxaZG/9bcyw3cEROspTL0DAfBgNVHSMEGDAWgBQIQuPb ThFm87UIxUDbVXwzRhGDODCCAQoGA1UdHwSCAQEwgf4wgfuggfiggfWGWGh0dHA6 Ly9tc2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL01pY3Jvc29mdCUy MFNlY3VyZSUyMFNlcnZlciUyMEF1dGhvcml0eSg4KS5jcmyGVmh0dHA6Ly9jcmwu bWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL2NybC9NaWNyb3NvZnQlMjBTZWN1cmUl MjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3JshkFodHRwOi8vY29ycHBraS9jcmwv TWljcm9zb2Z0JTIwU2VjdXJlJTIwU2VydmVyJTIwQXV0aG9yaXR5KDgpLmNybDCB vwYIKwYBBQUHAQEEgbIwga8wXgYIKwYBBQUHMAKGUmh0dHA6Ly93d3cubWljcm9z b2Z0LmNvbS9wa2kvbXNjb3JwL01pY3Jvc29mdCUyMFNlY3VyZSUyMFNlcnZlciUy MEF1dGhvcml0eSg4KS5jcnQwTQYIKwYBBQUHMAKGQWh0dHA6Ly9jb3JwcGtpL2Fp YS9NaWNyb3NvZnQlMjBTZWN1cmUlMjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3J0 MD8GCSsGAQQBgjcVBwQyMDAGKCsGAQQBgjcVCIPPiU2t8gKFoZ8MgvrKfYHh+3SB T4PC7YUIjqnShWMCAWQCAQkwJwYJKwYBBAGCNxUKBBowGDAKBggrBgEFBQcDAjAK BggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOCAQEACAHi+mcrNHJ/W+uBtnzD3mAm ai3QiLWiJE3dKuNtHV8Ba64E2l69Q7pmnFCr1eM5wlvnQcOqbVyZjk/okp4aRxBw ARn3KtvkhbSOHjaDYv3FXvobBXgenbPFydPvNmQrPGdTRSUf+q4duaYVSx2YAqpr HnYDbddNBJuFzfyywu6WSsrwgqUUW3jAaNmcrX7U5Z/sN1CQVOcx4dQ3nqXTYbgm 5+nddJhnC9PDyK4A4epAO9CA7h9023fRh9AZx17dgpRtteb+8JlV1+iMRdG/VrJK Gmnt8WCQFfOSQNChmicJikdzGfjtDjOqKA5g5CxxrwKWO7S5DaDH7Q286CkSXg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <SingleLogoutService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
- <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/SOAP"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Redirect"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/POST"/>
- <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Artifact"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
- <AssertionConsumerService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS" index="7"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Microsoft</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <GivenName>DreamSpark Engineering Team</GivenName>
- <EmailAddress>dsengt@microsoft.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <GivenName>Scott</GivenName>
- <SurName>Blackwell</SurName>
- <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
+ <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 http://schemas.xmlsoap.org/ws/2003/07/secext" >
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>www.dreamspark.com</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIF+jCCBOKgAwIBAgIKLqDfHAAIAAGj6DANBgkqhkiG9w0BAQUFADCBizETMBEG CgmSJomT8ixkARkWA2NvbTEZMBcGCgmSJomT8ixkARkWCW1pY3Jvc29mdDEUMBIG CgmSJomT8ixkARkWBGNvcnAxFzAVBgoJkiaJk/IsZAEZFgdyZWRtb25kMSowKAYD VQQDEyFNaWNyb3NvZnQgU2VjdXJlIFNlcnZlciBBdXRob3JpdHkwHhcNMTAwNzMw MDAyMTA4WhcNMTEwNzMwMDAyMTA4WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK V2FzaGluZ3RvbjEQMA4GA1UEBxMHU2VhdHRsZTETMBEGA1UEChMKRmFzdCBUcmFj azEUMBIGA1UECxMLRHJlYW0gU3BhcmsxGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJr LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtsyFSuceS0RVGHD1Qbch DWIdIGfELS06JXkb6EJELGld5j4P50fGSqMXDcPIt3jHqjt9jnd5aqJP4Z5ROs5p hJ7fXtm56taeSVTfZSQRIzlVyaIG1QSKeqdlt6GWZrlV+Gy2cKAglMcKh5/y5ISP /TbQWeJtreT+Pi/Aj0IQcGUCAwEAAaOCAvAwggLsMAsGA1UdDwQEAwIEsDBEBgkq hkiG9w0BCQ8ENzA1MA4GCCqGSIb3DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwBwYF Kw4DAgcwCgYIKoZIhvcNAwcwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB MB0GA1UdDgQWBBT2xedjpxaZG/9bcyw3cEROspTL0DAfBgNVHSMEGDAWgBQIQuPb ThFm87UIxUDbVXwzRhGDODCCAQoGA1UdHwSCAQEwgf4wgfuggfiggfWGWGh0dHA6 Ly9tc2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL01pY3Jvc29mdCUy MFNlY3VyZSUyMFNlcnZlciUyMEF1dGhvcml0eSg4KS5jcmyGVmh0dHA6Ly9jcmwu bWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL2NybC9NaWNyb3NvZnQlMjBTZWN1cmUl MjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3JshkFodHRwOi8vY29ycHBraS9jcmwv TWljcm9zb2Z0JTIwU2VjdXJlJTIwU2VydmVyJTIwQXV0aG9yaXR5KDgpLmNybDCB vwYIKwYBBQUHAQEEgbIwga8wXgYIKwYBBQUHMAKGUmh0dHA6Ly93d3cubWljcm9z b2Z0LmNvbS9wa2kvbXNjb3JwL01pY3Jvc29mdCUyMFNlY3VyZSUyMFNlcnZlciUy MEF1dGhvcml0eSg4KS5jcnQwTQYIKwYBBQUHMAKGQWh0dHA6Ly9jb3JwcGtpL2Fp YS9NaWNyb3NvZnQlMjBTZWN1cmUlMjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3J0 MD8GCSsGAQQBgjcVBwQyMDAGKCsGAQQBgjcVCIPPiU2t8gKFoZ8MgvrKfYHh+3SB T4PC7YUIjqnShWMCAWQCAQkwJwYJKwYBBAGCNxUKBBowGDAKBggrBgEFBQcDAjAK BggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOCAQEACAHi+mcrNHJ/W+uBtnzD3mAm ai3QiLWiJE3dKuNtHV8Ba64E2l69Q7pmnFCr1eM5wlvnQcOqbVyZjk/okp4aRxBw ARn3KtvkhbSOHjaDYv3FXvobBXgenbPFydPvNmQrPGdTRSUf+q4duaYVSx2YAqpr HnYDbddNBJuFzfyywu6WSsrwgqUUW3jAaNmcrX7U5Z/sN1CQVOcx4dQ3nqXTYbgm 5+nddJhnC9PDyK4A4epAO9CA7h9023fRh9AZx17dgpRtteb+8JlV1+iMRdG/VrJK Gmnt8WCQFfOSQNChmicJikdzGfjtDjOqKA5g5CxxrwKWO7S5DaDH7Q286CkSXg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/SOAP"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Redirect"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/POST"/>
+ <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Artifact"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <AssertionConsumerService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS" index="7"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Microsoft</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>DreamSpark Engineering Team</GivenName>
+ <EmailAddress>dsengt@microsoft.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Scott</GivenName>
+ <SurName>Blackwell</SurName>
+ <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/e5.onthehub.com.xml b/swamid-1.0/e5.onthehub.com.xml
index 26a92fbe..d548c8af 100644
--- a/swamid-1.0/e5.onthehub.com.xml
+++ b/swamid-1.0/e5.onthehub.com.xml
@@ -1,63 +1,63 @@
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
- <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate> MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
- BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
- MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
- BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
- 61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF
- YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb
- j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW
- 4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X
- UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R
- BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
- BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB
- AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5
- gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6
- VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
- K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
- eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T l8qQhkUldJphTqx2PEHORBM=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:AssertionConsumerService index="1"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST"
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="2"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST-SimpleSign"
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="3"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/Artifact"
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="4"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/ECP"
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="5"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/POST"
- Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- <md:AssertionConsumerService index="6"
- Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/Artifact"
- Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">E-academy, Inc.</OrganizationName>
- <OrganizationDisplayName xml:lang="en">E-academy, Inc.</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.e-academy.com/index.cfm</OrganizationURL>
- </Organization>
-
- <ContactPerson contactType="technical">
- <GivenName>Islam Gomaa</GivenName>
- <EmailAddress>SWAMID@e-academy.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <GivenName>Islam Gomaa</GivenName>
- <EmailAddress>SWAMID@e-academy.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <GivenName>Islam Gomaa</GivenName>
- <EmailAddress>SWAMID@e-academy.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
+ <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate> MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+ BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
+ MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+ BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
+ 61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF
+ YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb
+ j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW
+ 4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X
+ UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R
+ BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+ BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB
+ AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5
+ gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6
+ VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
+ K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
+ eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T l8qQhkUldJphTqx2PEHORBM=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService index="1"
+ Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST"
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
+ <md:AssertionConsumerService index="2"
+ Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST-SimpleSign"
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
+ <md:AssertionConsumerService index="3"
+ Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/Artifact"
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
+ <md:AssertionConsumerService index="4"
+ Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/ECP"
+ Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
+ <md:AssertionConsumerService index="5"
+ Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/POST"
+ Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
+ <md:AssertionConsumerService index="6"
+ Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/Artifact"
+ Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">E-academy, Inc.</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">E-academy, Inc.</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.e-academy.com/index.cfm</OrganizationURL>
+ </Organization>
+
+ <ContactPerson contactType="technical">
+ <GivenName>Islam Gomaa</GivenName>
+ <EmailAddress>SWAMID@e-academy.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Islam Gomaa</GivenName>
+ <EmailAddress>SWAMID@e-academy.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <GivenName>Islam Gomaa</GivenName>
+ <EmailAddress>SWAMID@e-academy.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp.irf.se.xml b/swamid-1.0/idp.irf.se.xml
index 72b67138..4af44cad 100644
--- a/swamid-1.0/idp.irf.se.xml
+++ b/swamid-1.0/idp.irf.se.xml
@@ -1,118 +1,118 @@
-<EntityDescriptor entityID="https://idp.irf.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAPBjklkGoYOts1Thq2Tib2SW7KLrMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5pcmYuc2UwHhcNMTEwMjE1MDgwODE2WhcNMTQw
-MjE1MDgwODE2WjAVMRMwEQYDVQQDEwppZHAuaXJmLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjjNXbUusdmeG5NOtfesU+e9bWSNnjakDy738JFRd
-1gOEHC5WRiQDpD0PLBNotYz3yxrtq9mv/pJ5zc83JpO9C99sNpsehdhhAdUscl1c
-BaGpv9RuL/5IHttH2JPEP5Evj4Txp+Cxl9c1C47mUT2BVdDbu24aSrSd+x9tKVs/
-u2rmaRrBFshPe1n6h8pLedI3nEmPNIMh+qklkpG3TWS13KLYZkX5yDahCOcEGe1P
-IjTB75Z8CWUiKCOB3vk2YtcCS7y4bZ23KYcNPUF88Dfkmxjg6LsCfzBfaVKKWdTD
-cEeSmu8Q3SUA6s6NRdgl1TZzr7VUvG7SGqEZmwf+e/ZGVwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaXJmLnNlhiFodHRwczovL2lkcC5pcmYuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFFSIYI0CtNOkIx0HH4EyfiV5rQaTMA0GCSqGSIb3DQEB
-BQUAA4IBAQAEiYbUXCNu1kTFfRSYeD02223t1YYmBSUjzvOnKrpJQbyRKxl7hwTp
-baTmxKu4n8wawUSTzlD8tpZe2wKbAAoE7K2TO89uAKLwTUj3V/oh5qy40DVxNOm7
-9tjhkt0ZVOvFdlBxw+LA/mYTg0H6IcqIcpXEgBenVXK1/RDT5ZEyDT0K/1Badyii
-mYoOgJsxQc5+NrGhkqSnw4kSwH5seBEqs5eq/260BjFErYuMvWbElxnMkh/FUJ4T
-F84dF7JlnXcS7kJj9sVwzWyEzR4GlpZQLTuucQqAWabMtOe8VDBkTIAj5xdNJgZp
-dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://idp.irf.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://idp.irf.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://idp.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://idp.irf.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAPBjklkGoYOts1Thq2Tib2SW7KLrMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5pcmYuc2UwHhcNMTEwMjE1MDgwODE2WhcNMTQw
-MjE1MDgwODE2WjAVMRMwEQYDVQQDEwppZHAuaXJmLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjjNXbUusdmeG5NOtfesU+e9bWSNnjakDy738JFRd
-1gOEHC5WRiQDpD0PLBNotYz3yxrtq9mv/pJ5zc83JpO9C99sNpsehdhhAdUscl1c
-BaGpv9RuL/5IHttH2JPEP5Evj4Txp+Cxl9c1C47mUT2BVdDbu24aSrSd+x9tKVs/
-u2rmaRrBFshPe1n6h8pLedI3nEmPNIMh+qklkpG3TWS13KLYZkX5yDahCOcEGe1P
-IjTB75Z8CWUiKCOB3vk2YtcCS7y4bZ23KYcNPUF88Dfkmxjg6LsCfzBfaVKKWdTD
-cEeSmu8Q3SUA6s6NRdgl1TZzr7VUvG7SGqEZmwf+e/ZGVwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaXJmLnNlhiFodHRwczovL2lkcC5pcmYuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFFSIYI0CtNOkIx0HH4EyfiV5rQaTMA0GCSqGSIb3DQEB
-BQUAA4IBAQAEiYbUXCNu1kTFfRSYeD02223t1YYmBSUjzvOnKrpJQbyRKxl7hwTp
-baTmxKu4n8wawUSTzlD8tpZe2wKbAAoE7K2TO89uAKLwTUj3V/oh5qy40DVxNOm7
-9tjhkt0ZVOvFdlBxw+LA/mYTg0H6IcqIcpXEgBenVXK1/RDT5ZEyDT0K/1Badyii
-mYoOgJsxQc5+NrGhkqSnw4kSwH5seBEqs5eq/260BjFErYuMvWbElxnMkh/FUJ4T
-F84dF7JlnXcS7kJj9sVwzWyEzR4GlpZQLTuucQqAWabMtOe8VDBkTIAj5xdNJgZp
-dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- </AttributeAuthorityDescriptor>
- <Organization>
- <OrganizationName xml:lang="en">IRF</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <GivenName>Mats</GivenName>
- <SurName>Luspa</SurName>
- <EmailAddress>matsl@irf.se</EmailAddress>
- </ContactPerson>
-
-</EntityDescriptor>
+<EntityDescriptor entityID="https://idp.irf.se/idp/shibboleth"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAPBjklkGoYOts1Thq2Tib2SW7KLrMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5pcmYuc2UwHhcNMTEwMjE1MDgwODE2WhcNMTQw
+MjE1MDgwODE2WjAVMRMwEQYDVQQDEwppZHAuaXJmLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAjjNXbUusdmeG5NOtfesU+e9bWSNnjakDy738JFRd
+1gOEHC5WRiQDpD0PLBNotYz3yxrtq9mv/pJ5zc83JpO9C99sNpsehdhhAdUscl1c
+BaGpv9RuL/5IHttH2JPEP5Evj4Txp+Cxl9c1C47mUT2BVdDbu24aSrSd+x9tKVs/
+u2rmaRrBFshPe1n6h8pLedI3nEmPNIMh+qklkpG3TWS13KLYZkX5yDahCOcEGe1P
+IjTB75Z8CWUiKCOB3vk2YtcCS7y4bZ23KYcNPUF88Dfkmxjg6LsCfzBfaVKKWdTD
+cEeSmu8Q3SUA6s6NRdgl1TZzr7VUvG7SGqEZmwf+e/ZGVwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaXJmLnNlhiFodHRwczovL2lkcC5pcmYuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFFSIYI0CtNOkIx0HH4EyfiV5rQaTMA0GCSqGSIb3DQEB
+BQUAA4IBAQAEiYbUXCNu1kTFfRSYeD02223t1YYmBSUjzvOnKrpJQbyRKxl7hwTp
+baTmxKu4n8wawUSTzlD8tpZe2wKbAAoE7K2TO89uAKLwTUj3V/oh5qy40DVxNOm7
+9tjhkt0ZVOvFdlBxw+LA/mYTg0H6IcqIcpXEgBenVXK1/RDT5ZEyDT0K/1Badyii
+mYoOgJsxQc5+NrGhkqSnw4kSwH5seBEqs5eq/260BjFErYuMvWbElxnMkh/FUJ4T
+F84dF7JlnXcS7kJj9sVwzWyEzR4GlpZQLTuucQqAWabMtOe8VDBkTIAj5xdNJgZp
+dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+ Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
+ index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+ Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
+ index="2"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
+ Location="https://idp.irf.se/idp/profile/Shibboleth/SSO" />
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+ Location="https://idp.irf.se/idp/profile/SAML2/POST/SSO" />
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://idp.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://idp.irf.se/idp/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAPBjklkGoYOts1Thq2Tib2SW7KLrMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5pcmYuc2UwHhcNMTEwMjE1MDgwODE2WhcNMTQw
+MjE1MDgwODE2WjAVMRMwEQYDVQQDEwppZHAuaXJmLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAjjNXbUusdmeG5NOtfesU+e9bWSNnjakDy738JFRd
+1gOEHC5WRiQDpD0PLBNotYz3yxrtq9mv/pJ5zc83JpO9C99sNpsehdhhAdUscl1c
+BaGpv9RuL/5IHttH2JPEP5Evj4Txp+Cxl9c1C47mUT2BVdDbu24aSrSd+x9tKVs/
+u2rmaRrBFshPe1n6h8pLedI3nEmPNIMh+qklkpG3TWS13KLYZkX5yDahCOcEGe1P
+IjTB75Z8CWUiKCOB3vk2YtcCS7y4bZ23KYcNPUF88Dfkmxjg6LsCfzBfaVKKWdTD
+cEeSmu8Q3SUA6s6NRdgl1TZzr7VUvG7SGqEZmwf+e/ZGVwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaXJmLnNlhiFodHRwczovL2lkcC5pcmYuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFFSIYI0CtNOkIx0HH4EyfiV5rQaTMA0GCSqGSIb3DQEB
+BQUAA4IBAQAEiYbUXCNu1kTFfRSYeD02223t1YYmBSUjzvOnKrpJQbyRKxl7hwTp
+baTmxKu4n8wawUSTzlD8tpZe2wKbAAoE7K2TO89uAKLwTUj3V/oh5qy40DVxNOm7
+9tjhkt0ZVOvFdlBxw+LA/mYTg0H6IcqIcpXEgBenVXK1/RDT5ZEyDT0K/1Badyii
+mYoOgJsxQc5+NrGhkqSnw4kSwH5seBEqs5eq/260BjFErYuMvWbElxnMkh/FUJ4T
+F84dF7JlnXcS7kJj9sVwzWyEzR4GlpZQLTuucQqAWabMtOe8VDBkTIAj5xdNJgZp
+dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+ Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+ Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">IRF</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Mats</GivenName>
+ <SurName>Luspa</SurName>
+ <EmailAddress>matsl@irf.se</EmailAddress>
+ </ContactPerson>
+
+</EntityDescriptor>
diff --git a/swamid-1.0/livesrv.ex.vr.se.xml b/swamid-1.0/livesrv.ex.vr.se.xml
index 4a8499b9..39f5f799 100644
--- a/swamid-1.0/livesrv.ex.vr.se.xml
+++ b/swamid-1.0/livesrv.ex.vr.se.xml
@@ -1,120 +1,120 @@
-<EntityDescriptor entityID="https://livesrv.ex.vr.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
-WhcNMzExMDExMDkwNjI1WjAbMRkwFwYDVQQDExBsaXZlc3J2LmV4LnZyLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXd832CJ92pEWl9agbHgE+yc
-zLwonOox29ZXk9x68vd5+n+36bO1gkb4dg+8xgHR3WqXOUwVajMWtUkhH7YN1dq2
-h8JzOQ20oTTfJQi13uzL+uyfu3Z+X1mAnxfAz8wr1IjRLBfjgCiyii87/TcpEZBl
-lT8p6W3E8hiB8Qdbd7FJf52q6y4nRikMlYK0JMAg9v9SvQPZoSd0Fift5Mt92Tes
-73vmimu0FK/2AkvDw7ANTV1YfuyFYUgZ6koRe1gO3JUFIKYXMgovUh2Gy9VjxW0h
-/YeOxgGUb8sC33VHDUd03oB90XcSdih+KaSxkw6gWUyuQZ9GvnzfYPpj2nblCQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsaXZlc3J2LmV4LnZyLnNlhidodHRwczovL2xp
-dmVzcnYuZXgudnIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKHqhiJr9a82
-J7vvd4BcjZn84W0qMA0GCSqGSIb3DQEBBQUAA4IBAQBpzAB/oEEbx4Hnbd9H+B/U
-ZkIrKc9RNnz76jr0EHVGma3iy7EeueJLdgEBgmwvYrzl5dyWSLrdw/sXBsuer7wM
-FeegMJozSv56MrpSoAODBsCeyrmldFGqRzBu5KjF9/MVRpwBqXEZnDEPe4gDKP+b
-JdxMfnBNi8mPEIZK/cAPcdnNYatIvWFzrvcGfLwUlJvEPt3FVPxibY8rMqS0v4vl
-E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
-7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://livesrv.ex.vr.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://livesrv.ex.vr.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-
-MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
-WhcNMzExMDExMDkwNjI1WjAbMRkwFwYDVQQDExBsaXZlc3J2LmV4LnZyLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXd832CJ92pEWl9agbHgE+yc
-zLwonOox29ZXk9x68vd5+n+36bO1gkb4dg+8xgHR3WqXOUwVajMWtUkhH7YN1dq2
-h8JzOQ20oTTfJQi13uzL+uyfu3Z+X1mAnxfAz8wr1IjRLBfjgCiyii87/TcpEZBl
-lT8p6W3E8hiB8Qdbd7FJf52q6y4nRikMlYK0JMAg9v9SvQPZoSd0Fift5Mt92Tes
-73vmimu0FK/2AkvDw7ANTV1YfuyFYUgZ6koRe1gO3JUFIKYXMgovUh2Gy9VjxW0h
-/YeOxgGUb8sC33VHDUd03oB90XcSdih+KaSxkw6gWUyuQZ9GvnzfYPpj2nblCQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsaXZlc3J2LmV4LnZyLnNlhidodHRwczovL2xp
-dmVzcnYuZXgudnIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKHqhiJr9a82
-J7vvd4BcjZn84W0qMA0GCSqGSIb3DQEBBQUAA4IBAQBpzAB/oEEbx4Hnbd9H+B/U
-ZkIrKc9RNnz76jr0EHVGma3iy7EeueJLdgEBgmwvYrzl5dyWSLrdw/sXBsuer7wM
-FeegMJozSv56MrpSoAODBsCeyrmldFGqRzBu5KjF9/MVRpwBqXEZnDEPe4gDKP+b
-JdxMfnBNi8mPEIZK/cAPcdnNYatIvWFzrvcGfLwUlJvEPt3FVPxibY8rMqS0v4vl
-E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
-7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- </AttributeAuthorityDescriptor>
-
-<Organization>
- <OrganizationName xml:lang="en">VR</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Vetenskapsrådet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Swedish Reasearch Council</Company>
- <EmailAddress>kontors-it@vr.se</EmailAddress>
- </ContactPerson>
-
-</EntityDescriptor>
+<EntityDescriptor entityID="https://livesrv.ex.vr.se/idp/shibboleth"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
+WhcNMzExMDExMDkwNjI1WjAbMRkwFwYDVQQDExBsaXZlc3J2LmV4LnZyLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXd832CJ92pEWl9agbHgE+yc
+zLwonOox29ZXk9x68vd5+n+36bO1gkb4dg+8xgHR3WqXOUwVajMWtUkhH7YN1dq2
+h8JzOQ20oTTfJQi13uzL+uyfu3Z+X1mAnxfAz8wr1IjRLBfjgCiyii87/TcpEZBl
+lT8p6W3E8hiB8Qdbd7FJf52q6y4nRikMlYK0JMAg9v9SvQPZoSd0Fift5Mt92Tes
+73vmimu0FK/2AkvDw7ANTV1YfuyFYUgZ6koRe1gO3JUFIKYXMgovUh2Gy9VjxW0h
+/YeOxgGUb8sC33VHDUd03oB90XcSdih+KaSxkw6gWUyuQZ9GvnzfYPpj2nblCQID
+AQABo2cwZTBEBgNVHREEPTA7ghBsaXZlc3J2LmV4LnZyLnNlhidodHRwczovL2xp
+dmVzcnYuZXgudnIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKHqhiJr9a82
+J7vvd4BcjZn84W0qMA0GCSqGSIb3DQEBBQUAA4IBAQBpzAB/oEEbx4Hnbd9H+B/U
+ZkIrKc9RNnz76jr0EHVGma3iy7EeueJLdgEBgmwvYrzl5dyWSLrdw/sXBsuer7wM
+FeegMJozSv56MrpSoAODBsCeyrmldFGqRzBu5KjF9/MVRpwBqXEZnDEPe4gDKP+b
+JdxMfnBNi8mPEIZK/cAPcdnNYatIvWFzrvcGfLwUlJvEPt3FVPxibY8rMqS0v4vl
+E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
+7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+ Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
+ index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+ Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
+ index="2"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
+ Location="https://livesrv.ex.vr.se/idp/profile/Shibboleth/SSO" />
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+ Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST/SSO" />
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+ Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+ Location="https://livesrv.ex.vr.se/idp/profile/SAML2/Redirect/SSO" />
+ </IDPSSODescriptor>
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">vr.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+
+MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
+WhcNMzExMDExMDkwNjI1WjAbMRkwFwYDVQQDExBsaXZlc3J2LmV4LnZyLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXd832CJ92pEWl9agbHgE+yc
+zLwonOox29ZXk9x68vd5+n+36bO1gkb4dg+8xgHR3WqXOUwVajMWtUkhH7YN1dq2
+h8JzOQ20oTTfJQi13uzL+uyfu3Z+X1mAnxfAz8wr1IjRLBfjgCiyii87/TcpEZBl
+lT8p6W3E8hiB8Qdbd7FJf52q6y4nRikMlYK0JMAg9v9SvQPZoSd0Fift5Mt92Tes
+73vmimu0FK/2AkvDw7ANTV1YfuyFYUgZ6koRe1gO3JUFIKYXMgovUh2Gy9VjxW0h
+/YeOxgGUb8sC33VHDUd03oB90XcSdih+KaSxkw6gWUyuQZ9GvnzfYPpj2nblCQID
+AQABo2cwZTBEBgNVHREEPTA7ghBsaXZlc3J2LmV4LnZyLnNlhidodHRwczovL2xp
+dmVzcnYuZXgudnIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKHqhiJr9a82
+J7vvd4BcjZn84W0qMA0GCSqGSIb3DQEBBQUAA4IBAQBpzAB/oEEbx4Hnbd9H+B/U
+ZkIrKc9RNnz76jr0EHVGma3iy7EeueJLdgEBgmwvYrzl5dyWSLrdw/sXBsuer7wM
+FeegMJozSv56MrpSoAODBsCeyrmldFGqRzBu5KjF9/MVRpwBqXEZnDEPe4gDKP+b
+JdxMfnBNi8mPEIZK/cAPcdnNYatIvWFzrvcGfLwUlJvEPt3FVPxibY8rMqS0v4vl
+E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
+7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+ Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+ Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ </AttributeAuthorityDescriptor>
+
+<Organization>
+ <OrganizationName xml:lang="en">VR</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Vetenskapsrådet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Swedish Reasearch Council</Company>
+ <EmailAddress>kontors-it@vr.se</EmailAddress>
+ </ContactPerson>
+
+</EntityDescriptor>
diff --git a/swamid-1.0/login.liu.se.xml b/swamid-1.0/login.liu.se.xml
index 4c6b3fbb..a9ddcbbb 100644
--- a/swamid-1.0/login.liu.se.xml
+++ b/swamid-1.0/login.liu.se.xml
@@ -1,145 +1,145 @@
-<EntityDescriptor entityID="https://login.liu.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
- <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-
- <mdui:Logo xml:lang="sv" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
- <mdui:Logo xml:lang="sv" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-sv.png</mdui:Logo>
- <mdui:Logo xml:lang="sv" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
- <mdui:Logo xml:lang="sv" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
-
- <mdui:Logo xml:lang="en" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
- <mdui:Logo xml:lang="en" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
- <mdui:Logo xml:lang="en" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
- <mdui:Logo xml:lang="en" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
- </mdui:UIInfo>
- <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DomainHint>liu.se</mdui:DomainHint>
- <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
- <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
- <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
- </mdui:DiscoHints>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
-MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
-X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
-2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
-ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
-Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
-g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
-hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
-bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
-t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
-G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
-zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
-dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.liu.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
-MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
-X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
-2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
-ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
-Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
-g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
-hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
-bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
-t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
-G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
-zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
-dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- </AttributeAuthorityDescriptor>
-
- <Organization>
- <OrganizationName xml:lang="en">LiU</OrganizationName>
- <OrganizationName xml:lang="sv">LiU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
- <OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</OrganizationURL>
- </Organization>
- <ContactPerson contactType="administrative">
- <Company>Linköping University</Company>
- <SurName>LiU-IT SAML admins</SurName>
- <EmailAddress>saml-admins@it.liu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="support">
- <Company>Linköping University</Company>
- <SurName>LiU-IT Helpdesk</SurName>
- <EmailAddress>helpdesk@liu.se</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <Company>Linköping University</Company>
- <SurName>LiU-IT SAML admins</SurName>
- <EmailAddress>saml-admins@it.liu.se</EmailAddress>
- </ContactPerson>
-
-</EntityDescriptor>
+<EntityDescriptor entityID="https://login.liu.se/idp/shibboleth"
+ xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
+
+ <mdui:Logo xml:lang="sv" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-sv.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
+
+ <mdui:Logo xml:lang="en" width="350" height="68">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="80" height="53">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="50" height="50">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" width="16" height="16">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>liu.se</mdui:DomainHint>
+ <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
+MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
+X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
+2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
+ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
+Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
+g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
+BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
+hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
+bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
+t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
+G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
+zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
+dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.liu.se/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
+MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
+X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
+2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
+ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
+Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
+g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
+BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
+hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
+bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
+t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
+G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
+zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
+dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ </AttributeAuthorityDescriptor>
+
+ <Organization>
+ <OrganizationName xml:lang="en">LiU</OrganizationName>
+ <OrganizationName xml:lang="sv">LiU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
+ <OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <Company>Linköping University</Company>
+ <SurName>LiU-IT SAML admins</SurName>
+ <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <Company>Linköping University</Company>
+ <SurName>LiU-IT Helpdesk</SurName>
+ <EmailAddress>helpdesk@liu.se</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <Company>Linköping University</Company>
+ <SurName>LiU-IT SAML admins</SurName>
+ <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+ </ContactPerson>
+
+</EntityDescriptor>
diff --git a/swamid-1.0/lpw.ki.se.xml b/swamid-1.0/lpw.ki.se.xml
index 9966022c..77666220 100644
--- a/swamid-1.0/lpw.ki.se.xml
+++ b/swamid-1.0/lpw.ki.se.xml
@@ -1,46 +1,46 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpw.ki.se/shibboleth">
-
- <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:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lpw.ki.se/Shibboleth.sso/Login"/>
- <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lpw.ki.se/Shibboleth.sso/Login" index="1"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>kiladok01.ki.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=kiladok01.ki.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJALIjJ4W5G5NlMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2tpbGFkb2swMS5raS5zZTAeFw0xMTA2MDkwOTE3MzJaFw0yMTA2MDYwOTE3
-MzJaMBoxGDAWBgNVBAMTD2tpbGFkb2swMS5raS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKaPBu20JzB9Ko3IQNSei/zbfY2N75RUATikwdmju6Uy
-lIFdSbQCsEl6o1mktZysNrUL2tj6l45kDZmaCxvKakuC5bIHQY9E8kWHdrXHTxEx
-QCDw6+NSHcRzJwKpUQZKVz7YdTNl+7qnoqpQpVYTB7aPMXn71xDHIspRg6RtJvly
-FH1ADlRyVuiUd/CKvp4b6UBOMmnHgbdKSaY0N362Ks0wmw13ZMc4O9QChgx4R33R
-4ooNV79byMtJ8RPomTNMTlVAnsSMFjXh3yNzxra7zGQnUAlzXyY5+rH1kaRqstfr
-XyxVg9nlvv82gsczPxXl0kexWh+DW3wB9LtflKkCyA0CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPa2lsYWRvazAxLmtpLnNlMB0GA1UdDgQWBBRzCPPEABQ2vMTzaw86FhJS
-/qGq9DANBgkqhkiG9w0BAQUFAAOCAQEAgcz87bN6b0aAbEceZR+bmbAHDrcU5bA2
-Z7LQt+PWQDeXS3WCf7xwGxHSUEer9gP078Zo1Z72UMnowQW4Fuwrp/lAOVhsAGPZ
-g10njIwKk9oi69hIgjoU+YD03Zt2zglrkOFoSH4Gy2QbmIiF3ihSjiY/eYtrDQhr
-yPAkIV8gl8A16so6D364fbNuF9ay5ONY3J+P20Scmuhuel55KdEnR1SIxdQ0Fml0
-XBbBB8yIgXxH5y12cJA0350DeuLjV2lI+Vwo+cHc4l4Iy60nCmU/AhOPsrn/KSol
-D1QNfeY/pFOqpfSxgp64TIVe9v9UJ7QJRm7zh51LDEjqyJwd/xxNyA==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpw.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpw.ki.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lpw.ki.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpw.ki.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpw.ki.se/Shibboleth.sso/SLO/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lpw.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lpw.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
- </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpw.ki.se/shibboleth">
+
+ <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:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lpw.ki.se/Shibboleth.sso/Login"/>
+ <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lpw.ki.se/Shibboleth.sso/Login" index="1"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>kiladok01.ki.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=kiladok01.ki.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJALIjJ4W5G5NlMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2tpbGFkb2swMS5raS5zZTAeFw0xMTA2MDkwOTE3MzJaFw0yMTA2MDYwOTE3
+MzJaMBoxGDAWBgNVBAMTD2tpbGFkb2swMS5raS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKaPBu20JzB9Ko3IQNSei/zbfY2N75RUATikwdmju6Uy
+lIFdSbQCsEl6o1mktZysNrUL2tj6l45kDZmaCxvKakuC5bIHQY9E8kWHdrXHTxEx
+QCDw6+NSHcRzJwKpUQZKVz7YdTNl+7qnoqpQpVYTB7aPMXn71xDHIspRg6RtJvly
+FH1ADlRyVuiUd/CKvp4b6UBOMmnHgbdKSaY0N362Ks0wmw13ZMc4O9QChgx4R33R
+4ooNV79byMtJ8RPomTNMTlVAnsSMFjXh3yNzxra7zGQnUAlzXyY5+rH1kaRqstfr
+XyxVg9nlvv82gsczPxXl0kexWh+DW3wB9LtflKkCyA0CAwEAAaM9MDswGgYDVR0R
+BBMwEYIPa2lsYWRvazAxLmtpLnNlMB0GA1UdDgQWBBRzCPPEABQ2vMTzaw86FhJS
+/qGq9DANBgkqhkiG9w0BAQUFAAOCAQEAgcz87bN6b0aAbEceZR+bmbAHDrcU5bA2
+Z7LQt+PWQDeXS3WCf7xwGxHSUEer9gP078Zo1Z72UMnowQW4Fuwrp/lAOVhsAGPZ
+g10njIwKk9oi69hIgjoU+YD03Zt2zglrkOFoSH4Gy2QbmIiF3ihSjiY/eYtrDQhr
+yPAkIV8gl8A16so6D364fbNuF9ay5ONY3J+P20Scmuhuel55KdEnR1SIxdQ0Fml0
+XBbBB8yIgXxH5y12cJA0350DeuLjV2lI+Vwo+cHc4l4Iy60nCmU/AhOPsrn/KSol
+D1QNfeY/pFOqpfSxgp64TIVe9v9UJ7QJRm7zh51LDEjqyJwd/xxNyA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpw.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpw.ki.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lpw.ki.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpw.ki.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpw.ki.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lpw.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lpw.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lpw.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/pingpong.chalmers.se.xml b/swamid-1.0/pingpong.chalmers.se.xml
index 09ac8f6b..deb0bc2d 100644
--- a/swamid-1.0/pingpong.chalmers.se.xml
+++ b/swamid-1.0/pingpong.chalmers.se.xml
@@ -1,36 +1,36 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://pingpong.chalmers.se/shibboleth">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDAzCCAeugAwIBAgIJAMLwpt/5/eu6MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHBpbmdwb25nLmNoYWxtZXJzLnNlMB4XDTEyMDQyMzE1Mzg1NloXDTIyMDQy
-MTE1Mzg1NlowHzEdMBsGA1UEAxMUcGluZ3BvbmcuY2hhbG1lcnMuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEv+Gw3RQeoVOamW80/g7vVEpgDIqy
-/pCrndJOnrSSxjBFwO3KfCnkioGjvzV/N+jt2AdtGucwY107CNp541hEjm9xMLeC
-8hR+khu1HWl1/IAht8EgMx0HnAFYJlVUjFcgYibjaaBIRQfGlfQorlWdBHnDXn0O
-KPRlyXv5p+lmJIl5vDCBkbzd4wapa3eyT6tBiDrH3sSunU/DTiEcJOwp3BOgY1zy
-Zu/JuVQfG9l4/s7qjWp5c5IEXBSvQ1+Ho/kMB/mVHbU/PZaZTOjMXKUvNdYhpgST
-CNXCaWnasUq1UrAo0FD0Kbr6Ams19l+7p1bIzFKdqFc9SYt0pc5RGSFxAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHBpbmdwb25nLmNoYWxtZXJzLnNlMB0GA1UdDgQWBBTX
-mSIhbeoUjlYpHmRjlF2+78PIRzANBgkqhkiG9w0BAQUFAAOCAQEAbOH4yUozvbEB
-UtOkIWC6qaoUKPf9VHIQveDqZdULpW3m2Q4vSzMKb/yo/tBLERUTgZ0NXYuT6iLv
-Zdgs0Cld6kS9UvZURqe8fKjfkJOnu4RI7VJASWfJsypoguih0fzIXiLxcbvXmJhV
-qiRt8BRZJjaWYvtzk711YfJFqV4vOpcU1+IpBX6gbyjzHY5adNVk3t568qPJxKU/
-KOUNSC34z9qxk4SIPE498SFpAYlJo5HnIN3aTa2WnzFUlcQFmFbuHTRDQ/v3X7dL
-eN939szhtbDgjf2BL5D0KmkrRPVsCVbqAcvWZ6j5u7tznMUK7l3IuWaTaRIdumnC
-0BPmIT4uxg==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/POST"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/ECP" index="3"/>
- </md:SPSSODescriptor>
-</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://pingpong.chalmers.se/shibboleth">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDAzCCAeugAwIBAgIJAMLwpt/5/eu6MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHBpbmdwb25nLmNoYWxtZXJzLnNlMB4XDTEyMDQyMzE1Mzg1NloXDTIyMDQy
+MTE1Mzg1NlowHzEdMBsGA1UEAxMUcGluZ3BvbmcuY2hhbG1lcnMuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEv+Gw3RQeoVOamW80/g7vVEpgDIqy
+/pCrndJOnrSSxjBFwO3KfCnkioGjvzV/N+jt2AdtGucwY107CNp541hEjm9xMLeC
+8hR+khu1HWl1/IAht8EgMx0HnAFYJlVUjFcgYibjaaBIRQfGlfQorlWdBHnDXn0O
+KPRlyXv5p+lmJIl5vDCBkbzd4wapa3eyT6tBiDrH3sSunU/DTiEcJOwp3BOgY1zy
+Zu/JuVQfG9l4/s7qjWp5c5IEXBSvQ1+Ho/kMB/mVHbU/PZaZTOjMXKUvNdYhpgST
+CNXCaWnasUq1UrAo0FD0Kbr6Ams19l+7p1bIzFKdqFc9SYt0pc5RGSFxAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHBpbmdwb25nLmNoYWxtZXJzLnNlMB0GA1UdDgQWBBTX
+mSIhbeoUjlYpHmRjlF2+78PIRzANBgkqhkiG9w0BAQUFAAOCAQEAbOH4yUozvbEB
+UtOkIWC6qaoUKPf9VHIQveDqZdULpW3m2Q4vSzMKb/yo/tBLERUTgZ0NXYuT6iLv
+Zdgs0Cld6kS9UvZURqe8fKjfkJOnu4RI7VJASWfJsypoguih0fzIXiLxcbvXmJhV
+qiRt8BRZJjaWYvtzk711YfJFqV4vOpcU1+IpBX6gbyjzHY5adNVk3t568qPJxKU/
+KOUNSC34z9qxk4SIPE498SFpAYlJo5HnIN3aTa2WnzFUlcQFmFbuHTRDQ/v3X7dL
+eN939szhtbDgjf2BL5D0KmkrRPVsCVbqAcvWZ6j5u7tznMUK7l3IuWaTaRIdumnC
+0BPmIT4uxg==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.chalmers.se/Shibboleth.sso/SLO/POST"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpong.chalmers.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
+
diff --git a/swamid-1.0/vmidgw3.miun.se.xml b/swamid-1.0/vmidgw3.miun.se.xml
index 5353c334..b618c28b 100644
--- a/swamid-1.0/vmidgw3.miun.se.xml
+++ b/swamid-1.0/vmidgw3.miun.se.xml
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://vmidgw3.miun.se/idp/shibboleth">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
-DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJkrr5rb4DLITBdU0e/8/lBAnoQq
-Bx/coeuJzCNP2EtRKCqTHB+v77geB+zzUZz2xDVmVjqMiO2/yCtZtI1hsK9nuPbV
-EZe1AuyQph31ud3r2ZkT/eS+xbmTyxAkMYSqrj55OC1Dfk0AYHGpS46q3JURD0A8
-OYOQb74IB1iC2+da3VKKjkbVlymdULN+o5Fg+zAzFymClSbPP3+Vu6D/65L2r1Bg
-DDgq9qtFGXdopNHnDU2eY+rTQEipa0EpVG7gv77Q1GFA2f5BCNTuW9AQOKnXTkbO
-hb1bXylESEvNL57+l8/8qdDEJmcvwJRHttVpSlWpTYQKMXK9J5kB3YIhUQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg92bWlkZ3czLm1pdW4uc2WGJmh0dHBzOi8vdm1pZGd3
-My5taXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRpUIa+z1bDfa7o0lKm
-pwa034YZhTANBgkqhkiG9w0BAQUFAAOCAQEAfgyLe7dVQXULh4wAVhCVeUNv40En
-hW929W1K+Zgtz+77nG5lnck88G2yrs15inPABkoGm6SYSYkycYeI7SY1rPy0aSMF
-DWSZLLppL5N1mLxsK+vbF8h3zHWJza8SrxmLoWN6FvM+bYcQb/Peg6MVFpAm3xSp
-EyV0GjP3wM/Qt05Pf26yvZRVXDingJ1RWIOwtNlCag8X/9yG+ktTdSaG+ecqXlq4
-A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
-I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmidgw3.miun.se/idp/profile/Shibboleth/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmidgw3.miun.se/idp/profile/SAML2/Redirect/SSO"/>
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
-DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJkrr5rb4DLITBdU0e/8/lBAnoQq
-Bx/coeuJzCNP2EtRKCqTHB+v77geB+zzUZz2xDVmVjqMiO2/yCtZtI1hsK9nuPbV
-EZe1AuyQph31ud3r2ZkT/eS+xbmTyxAkMYSqrj55OC1Dfk0AYHGpS46q3JURD0A8
-OYOQb74IB1iC2+da3VKKjkbVlymdULN+o5Fg+zAzFymClSbPP3+Vu6D/65L2r1Bg
-DDgq9qtFGXdopNHnDU2eY+rTQEipa0EpVG7gv77Q1GFA2f5BCNTuW9AQOKnXTkbO
-hb1bXylESEvNL57+l8/8qdDEJmcvwJRHttVpSlWpTYQKMXK9J5kB3YIhUQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg92bWlkZ3czLm1pdW4uc2WGJmh0dHBzOi8vdm1pZGd3
-My5taXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRpUIa+z1bDfa7o0lKm
-pwa034YZhTANBgkqhkiG9w0BAQUFAAOCAQEAfgyLe7dVQXULh4wAVhCVeUNv40En
-hW929W1K+Zgtz+77nG5lnck88G2yrs15inPABkoGm6SYSYkycYeI7SY1rPy0aSMF
-DWSZLLppL5N1mLxsK+vbF8h3zHWJza8SrxmLoWN6FvM+bYcQb/Peg6MVFpAm3xSp
-EyV0GjP3wM/Qt05Pf26yvZRVXDingJ1RWIOwtNlCag8X/9yG+ktTdSaG+ecqXlq4
-A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
-I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- </AttributeAuthorityDescriptor>
-
- <Organization>
- <OrganizationName xml:lang="en">MIUN</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Mittuniversitetet</Company>
- <EmailAddress>Ove.Olander@miun.se</EmailAddress>
- </ContactPerson>
-
-</EntityDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://vmidgw3.miun.se/idp/shibboleth">
+
+ <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
+DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJkrr5rb4DLITBdU0e/8/lBAnoQq
+Bx/coeuJzCNP2EtRKCqTHB+v77geB+zzUZz2xDVmVjqMiO2/yCtZtI1hsK9nuPbV
+EZe1AuyQph31ud3r2ZkT/eS+xbmTyxAkMYSqrj55OC1Dfk0AYHGpS46q3JURD0A8
+OYOQb74IB1iC2+da3VKKjkbVlymdULN+o5Fg+zAzFymClSbPP3+Vu6D/65L2r1Bg
+DDgq9qtFGXdopNHnDU2eY+rTQEipa0EpVG7gv77Q1GFA2f5BCNTuW9AQOKnXTkbO
+hb1bXylESEvNL57+l8/8qdDEJmcvwJRHttVpSlWpTYQKMXK9J5kB3YIhUQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg92bWlkZ3czLm1pdW4uc2WGJmh0dHBzOi8vdm1pZGd3
+My5taXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRpUIa+z1bDfa7o0lKm
+pwa034YZhTANBgkqhkiG9w0BAQUFAAOCAQEAfgyLe7dVQXULh4wAVhCVeUNv40En
+hW929W1K+Zgtz+77nG5lnck88G2yrs15inPABkoGm6SYSYkycYeI7SY1rPy0aSMF
+DWSZLLppL5N1mLxsK+vbF8h3zHWJza8SrxmLoWN6FvM+bYcQb/Peg6MVFpAm3xSp
+EyV0GjP3wM/Qt05Pf26yvZRVXDingJ1RWIOwtNlCag8X/9yG+ktTdSaG+ecqXlq4
+A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
+I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmidgw3.miun.se/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmidgw3.miun.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+ <Extensions>
+ <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
+DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJkrr5rb4DLITBdU0e/8/lBAnoQq
+Bx/coeuJzCNP2EtRKCqTHB+v77geB+zzUZz2xDVmVjqMiO2/yCtZtI1hsK9nuPbV
+EZe1AuyQph31ud3r2ZkT/eS+xbmTyxAkMYSqrj55OC1Dfk0AYHGpS46q3JURD0A8
+OYOQb74IB1iC2+da3VKKjkbVlymdULN+o5Fg+zAzFymClSbPP3+Vu6D/65L2r1Bg
+DDgq9qtFGXdopNHnDU2eY+rTQEipa0EpVG7gv77Q1GFA2f5BCNTuW9AQOKnXTkbO
+hb1bXylESEvNL57+l8/8qdDEJmcvwJRHttVpSlWpTYQKMXK9J5kB3YIhUQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg92bWlkZ3czLm1pdW4uc2WGJmh0dHBzOi8vdm1pZGd3
+My5taXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRpUIa+z1bDfa7o0lKm
+pwa034YZhTANBgkqhkiG9w0BAQUFAAOCAQEAfgyLe7dVQXULh4wAVhCVeUNv40En
+hW929W1K+Zgtz+77nG5lnck88G2yrs15inPABkoGm6SYSYkycYeI7SY1rPy0aSMF
+DWSZLLppL5N1mLxsK+vbF8h3zHWJza8SrxmLoWN6FvM+bYcQb/Peg6MVFpAm3xSp
+EyV0GjP3wM/Qt05Pf26yvZRVXDingJ1RWIOwtNlCag8X/9yG+ktTdSaG+ecqXlq4
+A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
+I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
+
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+ </AttributeAuthorityDescriptor>
+
+ <Organization>
+ <OrganizationName xml:lang="en">MIUN</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Mittuniversitetet</Company>
+ <EmailAddress>Ove.Olander@miun.se</EmailAddress>
+ </ContactPerson>
+
+</EntityDescriptor>