summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleifj <leifj@0878fbc5-a6f2-46f6-b174-cb7b08c221d1>2008-10-14 09:29:36 +0000
committerleifj <leifj@0878fbc5-a6f2-46f6-b174-cb7b08c221d1>2008-10-14 09:29:36 +0000
commit7e8f03520b91191f803c82bf94e4aa5a5bcc380b (patch)
treea59fb52baaea1e5822b476215ceeaf77eb70f6b5
parent73755616bcf7994dc4566002b6bb817a37951033 (diff)
replace with swamid master metadata registry
git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@39 0878fbc5-a6f2-46f6-b174-cb7b08c221d1
Diffstat
-rw-r--r--swamid-1.0/beta.augustus.se.xml4
-rw-r--r--swamid-1.0/callab0.it.secure.su.se.xml2
-rw-r--r--swamid-1.0/calsrv1.it.secure.su.se.xml2
-rw-r--r--swamid-1.0/cbs-vylvatest.kib.ki.se.xml24
-rw-r--r--swamid-1.0/downloads.channel8.msdn.com.xml31
-rw-r--r--swamid-1.0/dspace.it.su.se.xml2
-rw-r--r--swamid-1.0/ensky.lhs.se.xml7
-rw-r--r--swamid-1.0/hr-sso.pb.su.se.xml4
-rw-r--r--swamid-1.0/idp.guest.su.se.xml41
-rw-r--r--swamid-1.0/idp.hig.se.xml12
-rw-r--r--swamid-1.0/idp.lhs.se.xml8
-rw-r--r--swamid-1.0/idp.protectnetwork.org.xml4
-rw-r--r--swamid-1.0/idp.secure.su.se.xml8
-rw-r--r--swamid-1.0/idp.test.umu.se.xml10
-rw-r--r--swamid-1.0/j6.lan.kth.se.xml43
-rw-r--r--swamid-1.0/jolu.dev.it.secure.su.se.xml24
-rw-r--r--swamid-1.0/kurssystem.theducation.se.xml2
-rw-r--r--swamid-1.0/lab03.lab.it.su.se.xml2
-rw-r--r--swamid-1.0/labs.swami.se.xml2
-rw-r--r--swamid-1.0/lists.su.se.xml40
-rw-r--r--swamid-1.0/mars.dc.kau.se.xml43
-rw-r--r--swamid-1.0/mondo-web.it.su.se.xml2
-rw-r--r--swamid-1.0/mondo.su.se.xml4
-rw-r--r--swamid-1.0/moodle.lhs.se.xml40
-rw-r--r--swamid-1.0/pp-admin.it.su.se.xml23
-rw-r--r--swamid-1.0/public.it.secure.su.se.xml5
-rw-r--r--swamid-1.0/roundup-test.it.su.se.xml24
-rw-r--r--swamid-1.0/roundup.it.su.se.xml4
-rw-r--r--swamid-1.0/sakailab1.it.secure.su.se.xml2
-rw-r--r--swamid-1.0/sakailab2.it.secure.su.se.xml2
-rw-r--r--swamid-1.0/samsok.libris.kb.se.xml2
-rw-r--r--swamid-1.0/secure2.kau.se.xml24
-rw-r--r--swamid-1.0/shib-idp.kau.se.xml41
-rw-r--r--swamid-1.0/shib-sp.kau.se.xml24
-rw-r--r--swamid-1.0/shibboleth.ebscohost.com.xml2
-rw-r--r--swamid-1.0/shibboleth.sys.kth.se.xml10
-rw-r--r--swamid-1.0/shibboleth.testc.ladok.umu.se.xml43
-rw-r--r--swamid-1.0/shibidp.uu.se.xml10
-rw-r--r--swamid-1.0/sp.lhs.se.xml4
-rw-r--r--swamid-1.0/sp1.lab.it.su.se.xml2
-rw-r--r--swamid-1.0/stt_metadata.xml58
-rw-r--r--swamid-1.0/sympa.lab.it.su.se.xml2
-rw-r--r--swamid-1.0/toylan3.umdc.umu.se.xml4
-rw-r--r--swamid-1.0/tracks.it.su.se.xml24
-rw-r--r--swamid-1.0/umdac-humpdac.ad.umu.se.xml4
-rw-r--r--swamid-1.0/www.sub.su.se.xml4
-rw-r--r--swamid-1.0/www.wisum.umdac.umu.se.xml24
-rw-r--r--swamid-1.0/www2.genuinetext.com.xml4
-rw-r--r--swamid-1.0/www3.genuinetext.com.xml24
-rw-r--r--swamid-1.0/xfire.mimas.ac.uk.xml2
50 files changed, 369 insertions, 364 deletions
diff --git a/swamid-1.0/beta.augustus.se.xml b/swamid-1.0/beta.augustus.se.xml
index 8887e5f9..aa651847 100644
--- a/swamid-1.0/beta.augustus.se.xml
+++ b/swamid-1.0/beta.augustus.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.augustus.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-53" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -18,7 +18,7 @@
<ContactPerson contactType="technical">
<Company>Know Net AB</Company>
<GivenName>Ingemar</GivenName>
- <SurName>Lundström</SurName>
+ <SurName>Lundstr?m</SurName>
<EmailAddress>ingemar.lundstrom@knownet.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/callab0.it.secure.su.se.xml b/swamid-1.0/callab0.it.secure.su.se.xml
index cc45837d..4302497b 100644
--- a/swamid-1.0/callab0.it.secure.su.se.xml
+++ b/swamid-1.0/callab0.it.secure.su.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://callab0.it.secure.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-89" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/calsrv1.it.secure.su.se.xml b/swamid-1.0/calsrv1.it.secure.su.se.xml
index a5cb76f1..dcf1df5d 100644
--- a/swamid-1.0/calsrv1.it.secure.su.se.xml
+++ b/swamid-1.0/calsrv1.it.secure.su.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://calsrv1.it.secure.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-115" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/cbs-vylvatest.kib.ki.se.xml b/swamid-1.0/cbs-vylvatest.kib.ki.se.xml
new file mode 100644
index 00000000..e44a6ce9
--- /dev/null
+++ b/swamid-1.0/cbs-vylvatest.kib.ki.se.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cbs-vylvatest.kib.ki.se/shibboleth">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIB7TCCAVagAwIBAgIJAMV5iXtJKd2UMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF2Nicy12eWx2YXRlc3Qua2liLmtpLnNlMB4XDTA4MDcyMzEzMDM0OFoXDTA5MDcyMzEzMDM0OFowIjEgMB4GA1UEAxMXY2JzLXZ5bHZhdGVzdC5raWIua2kuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPAnswr/MkrQXkXZJbv3ArV/q0kowtVLnQIM6nuJjyw/96cQ7UuYFOFpIEhT+fQdthkKdSAAa74U10+r6wUqj7HgGWrKDn6HfGaYUx5vuLt7kHIuLSTdnU5xbH+9D2S1BwdK8qEjCtT5kxPk4/2mXpTVEdQRXdaxLanrIk4Sex/bAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAvRiCRo0g0bZ8TNZWO5iCmdrMCtDTM4I9JYf0zR0hYbf61U2r1h2iE3IfC4JvNmclEDbhL/aJQrqgglG8mSyBVYN9mu3L3y+O0ZvCLGC5EOHTLVZjihfL1VDwt054lB18AkxOh2H+dkcq6B7cI0XdFesHi4iW9HGr23C22xfLIpQ=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cbs-vylvatest.kib.ki.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">KI</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Karolinska Institutet</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.ki.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>KI bibliotek</Company>
+ <GivenName>Ylva</GivenName>
+ <SurName>Gavel</SurName>
+ <EmailAddress>ylva.gavel@ki.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/downloads.channel8.msdn.com.xml b/swamid-1.0/downloads.channel8.msdn.com.xml
new file mode 100644
index 00000000..59eb3fbb
--- /dev/null
+++ b/swamid-1.0/downloads.channel8.msdn.com.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEEDCCA3mgAwIBAgIQN06OsbviIojJc+SBPDreGzANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29tMB4XDTA3MTAwOTAwMDAwMFoXDTA4MTAwODIzNTk1OVowgZAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xFDASBgNVBAsTC0NFUlRJRklDQVRFMSQwIgYDVQQDExtkb3dubG9hZHMuY2hhbm5lbDgubXNkbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfyRQMTqYbgXsPNT2qgSnbF8qIkt1jsZ3rrT3s8ILtoYGSH6LgC7ILO/+Zktr5gBt84CMVmDY/XJ0jsN8NOzlBTD4yhpiaKxSABxSvyAHHTuzFBnXiGiLd4Pcw86vtaoBZ6srUBlrTwuvjIBBCB/g7L/aOUWAHEXUgXdi/yHi4jLZe/37lH0Wpfz/49NiesaIPRCZ8hYwYGnbVFr1BStSFztsM5YQFH3XabRF5XzapD8Gct1PwFCnyNdRvo2OXCrPLlEEBB+Y6+tNOwKOtqWtFsaUnURQWh/lf7sSHa+XrbI/Kne3ygVuEi3N5fqJaSo5unMBBPrrXR0ZZNV04Xqm7AgMBAAGjgaYwgaMwDAYDVR0TAQH/BAIwADBABgNVHR8EOTA3MDWgM6Axhi9odHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlU2VydmVyUHJlbWl1bUNBLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vb2NzcC50aGF3dGUuY29tMA0GCSqGSIb3DQEBBQUAA4GBALUFY4LBe1RA6yi+6jYgfqDP+8qnlVcTdYV9a9eJyrJvDZd8eMZqKuvAT9UXQeMSqbxZcgIn8GPEkCTX3HsuQChoZFadYsBWOha1je24YMZTSkouCE3W8yBR4XOFEs+bSTRT3KgVDqcKdr1Yf6FrxJzaVyKjMjWD3lNSYimR4opC</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">STT</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Student Tech Toolbox</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">https://downloads.channel8.msdn.com</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>STT Support</GivenName>
+ <EmailAddress>stt@9starresearch.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <GivenName>STT Technical</GivenName>
+ <EmailAddress>stt@9starresearch.com</EmailAddress>
+ </ContactPerson>
+ <ContactPerson contactType="administrative">
+ <GivenName>Bruce</GivenName>
+ <SurName>Curling</SurName>
+ <EmailAddress>bcurling@microsoft.com</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/dspace.it.su.se.xml b/swamid-1.0/dspace.it.su.se.xml
index 8530804f..de201ade 100644
--- a/swamid-1.0/dspace.it.su.se.xml
+++ b/swamid-1.0/dspace.it.su.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dspace.it.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-74" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/ensky.lhs.se.xml b/swamid-1.0/ensky.lhs.se.xml
index ada13de4..fa5c6251 100644
--- a/swamid-1.0/ensky.lhs.se.xml
+++ b/swamid-1.0/ensky.lhs.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ensky.lhs.se/shibboleth">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-77" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -17,8 +17,7 @@
</Organization>
<ContactPerson contactType="technical">
<Company>Stockholm university</Company>
- <GivenName>Leif</GivenName>
- <SurName>Johansson</SurName>
- <EmailAddress>leifj@it.su.se</EmailAddress>
+ <SurName>Helpdesk</SurName>
+ <EmailAddress>helpdesk@it.su.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/hr-sso.pb.su.se.xml b/swamid-1.0/hr-sso.pb.su.se.xml
index a548d4f8..53731287 100644
--- a/swamid-1.0/hr-sso.pb.su.se.xml
+++ b/swamid-1.0/hr-sso.pb.su.se.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<EntityDescriptor entityID="https://hr-sso.pb.su.se/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hr-sso.pb.su.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor>
+ <KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
<ds:X509Certificate>MIIB3TCCAUagAwIBAgIJAOF2WowBLXPYMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD2hyLXNzby5wYi5zdS5zZTAeFw0wODAyMjkwODUyNTFaFw0wOTAyMjgwODUyNTFaMBoxGDAWBgNVBAMTD2hyLXNzby5wYi5zdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyQTsbLU0XnL5j7JbZn4Ucbi9zDPXLbkapRdWV/jsHWyqCrd55UViMtYBHGRaODYp+SbE2dQ73F1dVw47SxYi/dMYD33BhI/AG4Us4vEhtCahJrvYqmPF9/t8QFnNrn1Nj+p+iXd4EsPg2j/Wh2+8auaJQO4rTmBGAlCgYZUtGFMCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQAlLF6dsYVzrXCbChbWCi1ydsjw3Lp1NgKzLahYwag0FSbX3jZzzVJKjlufSm5aeOmsdhwJc3f4/KRkpMmwziGm0jVfh5UO7rkXmXifgWi8fLRUCGNY9B/SxrMuQvy+AScM0al8l7RJxH04GUGr7rtEqRCcjH1FnDJfAezCe/vMiw==</ds:X509Certificate>
diff --git a/swamid-1.0/idp.guest.su.se.xml b/swamid-1.0/idp.guest.su.se.xml
deleted file mode 100644
index 4ec3e19a..00000000
--- a/swamid-1.0/idp.guest.su.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.guest.su.se/identity">
- <AttributeAuthorityDescriptor ID="role-11" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">guest.su.se</shibmeta:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEsDCCA5igAwIBAgILAQAAAAABF6ZzToswDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDEyMzExNDA1MFoXDTExMDEyMzExNDA1MFowXDELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEYMBYGA1UEAxMPaWRwLmd1ZXN0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz5yD6BRFbmTXgWxbY59dcXuuHQtfDtjgpUOT+It7yaQVaIKjJ8zEgWRCdOz64hDdB96zQVLDLvx+Vz1lYrCsESxwv11vahNaUY5jSYjUCXneWyrXVTxs+2wDHOzUNv+FK1C/ZvXESAaEP/LiFhYvffI9XYZD59nYcx9E31RVeHkkkc1xG5V4eXRrGmHzaSpvvXA6aCvYyeg4JSTZkJDchoU7cr1hUtrgaUx7OaXXLC/IipUmtuEtxfelyGelW3VWm749MQ0hs3TUOgigI1KHatBQUL705q2GvfgYtSp80KKn3xWRJ8J85+/V0zV/GOEJqSo1kOpx4Mr6d0FbjqfKxwIDAQABo4IBbjCCAWowUAYDVR0gBEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUqVxC206NS9eswPpRnBOay3IDy0cwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBoGA1UdEQQTMBGCD2lkcC5ndWVzdC5zdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEAPizmIb8TZ7ZtDXjwyKyU6TitXusX+PBo+9mxuKX+RtK5KEqFtKBDFJ82upOV7G+iP0Xk8B29dB7crfOiZIjANrQW3BysDLSV4GZIaj6vqImePZTbYGMENBPsurl0Yu+egUUN7GTANxDw3OPvGzbFQkot2hrK57i8poDKefpcUtiD59LXREf/RuP4zeovEFJ7zvhjlPR00G6z60R6eQSxA8ouBEnm044IDlr5Un7n5rMyhBPoP6PwZS3jRpWF/NMkkZWv9Tn8JkRCCx125zioSHZu5RFR42BLiCMMza7yjiTL/50WcBL8JVJsuUx6ulcDJSMNJBSRl0WBaLhkJte36A==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.guest.su.se:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-12" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">guest.su.se</shibmeta:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEsDCCA5igAwIBAgILAQAAAAABF6ZzToswDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDEyMzExNDA1MFoXDTExMDEyMzExNDA1MFowXDELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEYMBYGA1UEAxMPaWRwLmd1ZXN0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz5yD6BRFbmTXgWxbY59dcXuuHQtfDtjgpUOT+It7yaQVaIKjJ8zEgWRCdOz64hDdB96zQVLDLvx+Vz1lYrCsESxwv11vahNaUY5jSYjUCXneWyrXVTxs+2wDHOzUNv+FK1C/ZvXESAaEP/LiFhYvffI9XYZD59nYcx9E31RVeHkkkc1xG5V4eXRrGmHzaSpvvXA6aCvYyeg4JSTZkJDchoU7cr1hUtrgaUx7OaXXLC/IipUmtuEtxfelyGelW3VWm749MQ0hs3TUOgigI1KHatBQUL705q2GvfgYtSp80KKn3xWRJ8J85+/V0zV/GOEJqSo1kOpx4Mr6d0FbjqfKxwIDAQABo4IBbjCCAWowUAYDVR0gBEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUqVxC206NS9eswPpRnBOay3IDy0cwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBoGA1UdEQQTMBGCD2lkcC5ndWVzdC5zdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEAPizmIb8TZ7ZtDXjwyKyU6TitXusX+PBo+9mxuKX+RtK5KEqFtKBDFJ82upOV7G+iP0Xk8B29dB7crfOiZIjANrQW3BysDLSV4GZIaj6vqImePZTbYGMENBPsurl0Yu+egUUN7GTANxDw3OPvGzbFQkot2hrK57i8poDKefpcUtiD59LXREf/RuP4zeovEFJ7zvhjlPR00G6z60R6eQSxA8ouBEnm044IDlr5Un7n5rMyhBPoP6PwZS3jRpWF/NMkkZWv9Tn8JkRCCx125zioSHZu5RFR42BLiCMMza7yjiTL/50WcBL8JVJsuUx6ulcDJSMNJBSRl0WBaLhkJte36A==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.guest.su.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.guest.su.se/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">SUGUEST</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Stockholm university (guest account)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.guest.su.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Stockholm university</Company>
- <EmailAddress>leifj@it.su.se</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/idp.hig.se.xml b/swamid-1.0/idp.hig.se.xml
index 8ea40604..6767f101 100644
--- a/swamid-1.0/idp.hig.se.xml
+++ b/swamid-1.0/idp.hig.se.xml
@@ -1,27 +1,27 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hig.se/identity">
- <AttributeAuthorityDescriptor ID="role-141" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">hig.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB0zCCATygAwIBAgIJANRR8y5fafAVMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMDcwOTE4MTI0MzE3WhcNMDgwOTE3MTI0MzE3WjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo5fE9PBrkWmigZMI9gb6bilnAl8/1E1v1NMymvm8rAi00Ifqodng/3i/LsPawuk/syr3JxERiSwVk2kcxUZEqdFxHkVK/B6q2lMOCeVW8uE8qYRdWJlrN2VmZujqwQ9WI3o0803Q3Bp/MLuHNh7Z3pdJv9Uw3mVnNumMKy+BMkwIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAEkX2n3O4n+sFn0JkLDoCtcMPMyuR06/stby1bukZ0iaJsMfdQ0rZ496SnHAxHS1EgMuARt8d4NPGGPu0B2OfpbRLZKodyWUn46fyXdU6khrSrO4Mpt7oQmFNaCSXvZ0M/aC3lOxXAXLhBlVV/iqJg+BIlJVR3MJp6paXe6b3PPk</ds:X509Certificate>
+ <ds:X509Certificate>MIIEjTCCA3WgAwIBAgILAQAAAAABF3zoubQwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDExNTEwMDUwMloXDTExMDExNTEwMDUwMlowPjELMAkGA1UEBhMCU0UxGjAYBgNVBAoTEUhvZ3Nrb2xhbiBpIEdhdmxlMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzVJwkvrkl/JSBQKx95eRku9iUK8odClbfPr4AlDANP+b2mWYiUaSxoXu+SJkUO/HDtBDmcghRvGHYyv6YLXANk17bzV7PemQb4zA0plyKaurqY6M1FLx5RNEXDplElriWQsDA0Tyuhoz6t/uZpHETngtHpu7NlxWsyONUxeR7Cf6r2DjqiRBn76kI+8G1HBfTHf0xCGZmPWYewJzH1dnFT4pUaWu6psqhGMmZ5jgb0cDyVOz+sKcDp7MlMfQG/vziUySepAKfKSer7Dr84bVUIsa8C+ikQF582Q33Zuunpm+hJRDntXTA3ZJdmK38muiVaSBa70oL+ri7ZcnIceVWwIDAQABo4IBaTCCAWUwUAYDVR0gBEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUc6OwpqVR5fUo66R7/PzCQUtL1mswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBUGA1UdEQQOMAyCCmlkcC5oaWcuc2UwDQYJKoZIhvcNAQEFBQADggEBAGYIiDLBZooLBBfMbHTA/aU6Vf2lD8++0uZ/pDsO0fHT52dhLB/zVOxQoJvs7P8z4VOQYM60N4iC18cOrEmt9//8V+4OzLnkrGKrr7xDuc6JBpHkMTUiYozHCPPOCAgmf/OZmCEnWc+ne0dHx+A+ThJy9PEebN2yvjs307dP/GFgWSjXKKGVVLnJ2G9/bYn/gTi51/etdbbC0oXZ7GnV2fEI2IhU18IacIogt0RODek8hnEEfSBBEvS7Yb+g/NPZsdM3NiKs486221H7eF0MllYb+Z68AKqtOv+bJZyXnmYaoyENgNrEyIHrd5rGeACUjq4u31pt2dlMWuPW1O/xbf0=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/shibboleth-idp/AA"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
</AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-142" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">hig.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB0zCCATygAwIBAgIJANRR8y5fafAVMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMDcwOTE4MTI0MzE3WhcNMDgwOTE3MTI0MzE3WjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo5fE9PBrkWmigZMI9gb6bilnAl8/1E1v1NMymvm8rAi00Ifqodng/3i/LsPawuk/syr3JxERiSwVk2kcxUZEqdFxHkVK/B6q2lMOCeVW8uE8qYRdWJlrN2VmZujqwQ9WI3o0803Q3Bp/MLuHNh7Z3pdJv9Uw3mVnNumMKy+BMkwIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAEkX2n3O4n+sFn0JkLDoCtcMPMyuR06/stby1bukZ0iaJsMfdQ0rZ496SnHAxHS1EgMuARt8d4NPGGPu0B2OfpbRLZKodyWUn46fyXdU6khrSrO4Mpt7oQmFNaCSXvZ0M/aC3lOxXAXLhBlVV/iqJg+BIlJVR3MJp6paXe6b3PPk</ds:X509Certificate>
+ <ds:X509Certificate>MIIEjTCCA3WgAwIBAgILAQAAAAABF3zoubQwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDExNTEwMDUwMloXDTExMDExNTEwMDUwMlowPjELMAkGA1UEBhMCU0UxGjAYBgNVBAoTEUhvZ3Nrb2xhbiBpIEdhdmxlMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzVJwkvrkl/JSBQKx95eRku9iUK8odClbfPr4AlDANP+b2mWYiUaSxoXu+SJkUO/HDtBDmcghRvGHYyv6YLXANk17bzV7PemQb4zA0plyKaurqY6M1FLx5RNEXDplElriWQsDA0Tyuhoz6t/uZpHETngtHpu7NlxWsyONUxeR7Cf6r2DjqiRBn76kI+8G1HBfTHf0xCGZmPWYewJzH1dnFT4pUaWu6psqhGMmZ5jgb0cDyVOz+sKcDp7MlMfQG/vziUySepAKfKSer7Dr84bVUIsa8C+ikQF582Q33Zuunpm+hJRDntXTA3ZJdmK38muiVaSBa70oL+ri7ZcnIceVWwIDAQABo4IBaTCCAWUwUAYDVR0gBEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUc6OwpqVR5fUo66R7/PzCQUtL1mswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBUGA1UdEQQOMAyCCmlkcC5oaWcuc2UwDQYJKoZIhvcNAQEFBQADggEBAGYIiDLBZooLBBfMbHTA/aU6Vf2lD8++0uZ/pDsO0fHT52dhLB/zVOxQoJvs7P8z4VOQYM60N4iC18cOrEmt9//8V+4OzLnkrGKrr7xDuc6JBpHkMTUiYozHCPPOCAgmf/OZmCEnWc+ne0dHx+A+ThJy9PEebN2yvjs307dP/GFgWSjXKKGVVLnJ2G9/bYn/gTi51/etdbbC0oXZ7GnV2fEI2IhU18IacIogt0RODek8hnEEfSBBEvS7Yb+g/NPZsdM3NiKs486221H7eF0MllYb+Z68AKqtOv+bJZyXnmYaoyENgNrEyIHrd5rGeACUjq4u31pt2dlMWuPW1O/xbf0=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
@@ -31,11 +31,11 @@
</IDPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">HIG</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Högskolan i Gävle</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">H?gskolan i G?vle</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
- <Company>Högskolan i Gävle</Company>
+ <Company>H?gskolan i G?vle</Company>
<EmailAddress>Patrik.Carlsson@hig.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/idp.lhs.se.xml b/swamid-1.0/idp.lhs.se.xml
index b6743572..f467e95c 100644
--- a/swamid-1.0/idp.lhs.se.xml
+++ b/swamid-1.0/idp.lhs.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lhs.se/identity">
- <AttributeAuthorityDescriptor ID="role-126" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">lhs.se</shibmeta:Scope>
</Extensions>
@@ -14,7 +14,7 @@
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhs.se:8443/shibboleth-idp/AA"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
</AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-127" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">lhs.se</shibmeta:Scope>
</Extensions>
@@ -31,11 +31,11 @@
</IDPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">LHS</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Lärarhögskolan i Stockholm</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">L?rarh?gskolan</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.lhs.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
- <Company>Lärarhögskolan i Stockholm</Company>
+ <Company>L?rarh?gskolan</Company>
<EmailAddress>info@lhs.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/idp.protectnetwork.org.xml b/swamid-1.0/idp.protectnetwork.org.xml
index 7781ddab..4cfc90ab 100644
--- a/swamid-1.0/idp.protectnetwork.org.xml
+++ b/swamid-1.0/idp.protectnetwork.org.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.protectnetwork.org/protectnetwork-idp">
- <AttributeAuthorityDescriptor ID="role-38" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">idp.protectnetwork.org</shibmeta:Scope>
</Extensions>
@@ -14,7 +14,7 @@
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.protectnetwork.org:8443/protectnetwork-idp/AA"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
</AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-39" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">idp.protectnetwork.org</shibmeta:Scope>
</Extensions>
diff --git a/swamid-1.0/idp.secure.su.se.xml b/swamid-1.0/idp.secure.su.se.xml
index b5271e27..ae75ae60 100644
--- a/swamid-1.0/idp.secure.su.se.xml
+++ b/swamid-1.0/idp.secure.su.se.xml
@@ -1,27 +1,27 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.secure.su.se/identity">
- <AttributeAuthorityDescriptor ID="role-11" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">su.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB3zCCAUigAwIBAgIJAOsty09OcvGDMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEGlkcC5zZWN1cmUuc3Uuc2UwHhcNMDcwNDE4MDg0NTQ3WhcNMDgwNDE3MDg0NTQ3WjAbMRkwFwYDVQQDExBpZHAuc2VjdXJlLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9N+bt1K2mNDRE4dHSNUihDurMPjW/jG58SgU7aQYUoIZSBayTm42VdXZ1hvsM7Ywnkn/5dg4iZX3hmPim9VcorM+TpPhMQ8hjzGxY3hKm6s7x3UdwWT4hX1+LHsOt+MpidAdO/qw/8/SeOydDavL5zLwSC1SLC7FpVZGUtUtg+wIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBACc/NZzp3vcOkqbdD81uyYP9LmSUiuXkSF0RQIt3Jc3f+m55qFv4qTjEL5IfGY4chTu37K9MQMkZffT7stvBe67XaBpryNdkoyJSHns/ui9uZP/f42iYoZ1j9qgEVvHhu4SYGQFBKEdIt+bHJz1ACQO/9MUOw0Jq8oCtAeqBIy9v</ds:X509Certificate>
+ <ds:X509Certificate>MIIEsjCCA5qgAwIBAgILAQAAAAABFxsEM3owDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3MTIyNzA5NTIxNVoXDTEwMTIyNzA5NTIxNVowXTELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEZMBcGA1UEAxMQaWRwLnNlY3VyZS5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8J47onJaot9vYgL5d+VXRuBTlwy4quLRkcFDvAhy9YwzdDAZ0bio2qgVpXMK1aP1kvpOn6+Zy9jUKuwaUraJpE8Yp7dCzTXujrCQSS3sfy+pTwS/kcDUM/sBd16gXU4lfub56+Oiuvi9eRISDKTeZebgTskN2O7gZS91nLSo7xz/Fsrinp3oRWcqZ0VWzc0+zLIldU50ASZ/AqDQQ/JLaqI84b6Ft8JjWZKCGUqBBoRURjvDxqr2e19i2+2mu5Cbayq6IJ62yH+dP3pVd9UZntSXABaTnq2+v9dt/unhOXibzMwh87q+fI9w7SyM7Wy/r6V3qk/aes0bYI6Sj8DW0CAwEAAaOCAW8wggFrMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFMAf54GaLCmlAHIKbGBskYgJ64yTMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHREEFDASghBpZHAuc2VjdXJlLnN1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQA2ZODtOolJMQNFz86urE/RM3LIwkaaRHv9WN743WEPVyrQ0s7XjYuHAuJCuLVhwteA0ODpbmYJHaesG1O4Hqilv/tRD+8MahGWqA2lk28T7mkx+/Hb2jsZWBIMGNNOf97sZUK100wbnsFvjvBsOAsznnRX2JKOBeemOnIPZR1EmA+VRxUaIHb2/SD63zSsa/+y8xkSYAo1Pxr9MU6jePNIPnMF7ixwfzTZElyoxKuNNbQAuxfvvbRElGs2YCmC9WBY8zGmyHfNWWblVt5tjeNH0pWu+qg1tVBSB9VZZ4xGuKgoMyoYKul4y3raQRiUCUaUmJCdAiQNqsSMpY3QpA+k</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.secure.su.se:8443/shibboleth-idp/AA"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
</AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-12" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">su.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB3zCCAUigAwIBAgIJAOsty09OcvGDMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEGlkcC5zZWN1cmUuc3Uuc2UwHhcNMDcwNDE4MDg0NTQ3WhcNMDgwNDE3MDg0NTQ3WjAbMRkwFwYDVQQDExBpZHAuc2VjdXJlLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9N+bt1K2mNDRE4dHSNUihDurMPjW/jG58SgU7aQYUoIZSBayTm42VdXZ1hvsM7Ywnkn/5dg4iZX3hmPim9VcorM+TpPhMQ8hjzGxY3hKm6s7x3UdwWT4hX1+LHsOt+MpidAdO/qw/8/SeOydDavL5zLwSC1SLC7FpVZGUtUtg+wIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBACc/NZzp3vcOkqbdD81uyYP9LmSUiuXkSF0RQIt3Jc3f+m55qFv4qTjEL5IfGY4chTu37K9MQMkZffT7stvBe67XaBpryNdkoyJSHns/ui9uZP/f42iYoZ1j9qgEVvHhu4SYGQFBKEdIt+bHJz1ACQO/9MUOw0Jq8oCtAeqBIy9v</ds:X509Certificate>
+ <ds:X509Certificate>MIIEsjCCA5qgAwIBAgILAQAAAAABFxsEM3owDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3MTIyNzA5NTIxNVoXDTEwMTIyNzA5NTIxNVowXTELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEZMBcGA1UEAxMQaWRwLnNlY3VyZS5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8J47onJaot9vYgL5d+VXRuBTlwy4quLRkcFDvAhy9YwzdDAZ0bio2qgVpXMK1aP1kvpOn6+Zy9jUKuwaUraJpE8Yp7dCzTXujrCQSS3sfy+pTwS/kcDUM/sBd16gXU4lfub56+Oiuvi9eRISDKTeZebgTskN2O7gZS91nLSo7xz/Fsrinp3oRWcqZ0VWzc0+zLIldU50ASZ/AqDQQ/JLaqI84b6Ft8JjWZKCGUqBBoRURjvDxqr2e19i2+2mu5Cbayq6IJ62yH+dP3pVd9UZntSXABaTnq2+v9dt/unhOXibzMwh87q+fI9w7SyM7Wy/r6V3qk/aes0bYI6Sj8DW0CAwEAAaOCAW8wggFrMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFMAf54GaLCmlAHIKbGBskYgJ64yTMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHREEFDASghBpZHAuc2VjdXJlLnN1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQA2ZODtOolJMQNFz86urE/RM3LIwkaaRHv9WN743WEPVyrQ0s7XjYuHAuJCuLVhwteA0ODpbmYJHaesG1O4Hqilv/tRD+8MahGWqA2lk28T7mkx+/Hb2jsZWBIMGNNOf97sZUK100wbnsFvjvBsOAsznnRX2JKOBeemOnIPZR1EmA+VRxUaIHb2/SD63zSsa/+y8xkSYAo1Pxr9MU6jePNIPnMF7ixwfzTZElyoxKuNNbQAuxfvvbRElGs2YCmC9WBY8zGmyHfNWWblVt5tjeNH0pWu+qg1tVBSB9VZZ4xGuKgoMyoYKul4y3raQRiUCUaUmJCdAiQNqsSMpY3QpA+k</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
diff --git a/swamid-1.0/idp.test.umu.se.xml b/swamid-1.0/idp.test.umu.se.xml
index f67a98d4..66f5f897 100644
--- a/swamid-1.0/idp.test.umu.se.xml
+++ b/swamid-1.0/idp.test.umu.se.xml
@@ -1,27 +1,27 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.test.umu.se/identity">
- <AttributeAuthorityDescriptor ID="role-61" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIEXDCCA0SgAwIBAgICAaQwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wNzAzMTQxMjI4MTFaFw0wODAzMTMxMjI4MTFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggHbMIIB1zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUtYn8hRBOx2BIGPfGr6FNI3apmTkwfwYDVR0jBHgwdoAUdpABx++trgCx92nZ/hUorOYyzkChW6RZMFcxCzAJBgNVBAYTAlNFMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkxEzARBgNVBAsTClN3VVBLSS1QQ0ExGTAXBgNVBAMTEFN3VVBLSSBQb2xpY3kgQ0GCAREwKgYDVR0SBCMwIYEJY2FAdW11LnNlhhRodHRwOi8vd3d3LmNhLnVtdS5zZTAwBgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vd3d3LmNhLnVtdS5zZS9jcmxfdjIuY3JsMBEGCWCGSAGG+EIBAQQEAwIGQDAsBglghkgBhvhCAQ0EHxYdV1dXLVNlcnZlciBvZiBVbWVhIFVuaXZlcnNpdHkwfgYDVR0gBHcwdTBzBggqhXArAgEBATBnMCQGCCsGAQUFBwIBFhhodHRwOi8vd3d3LmNhLnVtdS5zZS9DUFMwPwYIKwYBBQUHAgIwMxoxTGltaXRlZCBMaWFiaWxpdHksIHNlZSBodHRwOi8vd3d3LnN3dXBraS5zdS5zZS9DUDANBgkqhkiG9w0BAQUFAAOCAQEAjPbzGnpeXpzXuQGQeZA5aZqfxi/2R6osH94vLj0rDuSJk5mynCD5t+hgcqWOuD43VT++vBMGnDe060c9M3TyQA9ZsIxVivZArAfnb6bqgca9xB7DLOITBHhZeKgOjT/TUsfNBdZEILDbNmyOfhTgS97scfitAvCowIMwvsCmVTfFZwG5u1rJp4SpJwwZb/ekpkU6wLYRaLzkoZW8f5ivKKHJWud+iddkg71yMnMFigWQIRfNdaK+wz9oZwc+AyPwqz4u7BJlg4Z2SgKutjIwyMqLkm1g5Od5y1sF+Wpq5/mzK9FuS6oLzDSTmb3Q5IRbFzlTghqsLEsb3pRHXCrk/A==</ds:X509Certificate>
+ <ds:X509Certificate>MIIEOjCCAyKgAwIBAgICAd4wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wODAzMTIxNDEwNDFaFw0wODExMDcxNDEwNDFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggG5MIIBtTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFLWJ/IUQTsdgSBj3xq+hTSN2qZk5MH8GA1UdIwR4MHaAFHaQAcfvra4Asfdp2f4VKKzmMs5AoVukWTBXMQswCQYDVQQGEwJTRTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRMwEQYDVQQLEwpTd1VQS0ktUENBMRkwFwYDVQQDExBTd1VQS0kgUG9saWN5IENBggERMCoGA1UdEgQjMCGBCWNhQHVtdS5zZYYUaHR0cDovL3d3dy5jYS51bXUuc2UwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3d3dy5jYS51bXUuc2UvY3JsX3YyLmNybDB+BgNVHSAEdzB1MHMGCCqFcCsCAQEBMGcwJAYIKwYBBQUHAgEWGGh0dHA6Ly93d3cuY2EudW11LnNlL0NQUzA/BggrBgEFBQcCAjAzGjFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly93d3cuc3d1cGtpLnN1LnNlL0NQMA0GCSqGSIb3DQEBBQUAA4IBAQBjHF+0/RXKijMD2t6taOHp61TSP47fa/s9gD2H7mjlXKxwf2VHaN2mQ5Cy71atSzWpgfArCbND6lYLIaguDqkj+TtJAse3VBFe/nlaY5ewKxfaCLnnNGGNnoFaoVjTiZYrSYvSsqHjMmwIsgeAhVtAagkmB71B6QRL7nXwAJffNa1LVpVVI4e5T1tKa9BB5Z7LwqZSnC/MnBkNEU9h/Lw3gzIZyijNbnkOAVBnRf9gJwC8dHNafWhHyGj4urC2/GZIR+Mt+5HgQ2DKufHBjMv4a6edLS/gZFb4KfxmjgZDrb0ZC75Y9lcqiz8QZDXbu/4/ptMx7dNkEPfwJyuOD0TP</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.umu.se:9443/shibboleth-idp/AA"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
</AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-62" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIEXDCCA0SgAwIBAgICAaQwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wNzAzMTQxMjI4MTFaFw0wODAzMTMxMjI4MTFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggHbMIIB1zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHQ4EFgQUtYn8hRBOx2BIGPfGr6FNI3apmTkwfwYDVR0jBHgwdoAUdpABx++trgCx92nZ/hUorOYyzkChW6RZMFcxCzAJBgNVBAYTAlNFMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkxEzARBgNVBAsTClN3VVBLSS1QQ0ExGTAXBgNVBAMTEFN3VVBLSSBQb2xpY3kgQ0GCAREwKgYDVR0SBCMwIYEJY2FAdW11LnNlhhRodHRwOi8vd3d3LmNhLnVtdS5zZTAwBgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vd3d3LmNhLnVtdS5zZS9jcmxfdjIuY3JsMBEGCWCGSAGG+EIBAQQEAwIGQDAsBglghkgBhvhCAQ0EHxYdV1dXLVNlcnZlciBvZiBVbWVhIFVuaXZlcnNpdHkwfgYDVR0gBHcwdTBzBggqhXArAgEBATBnMCQGCCsGAQUFBwIBFhhodHRwOi8vd3d3LmNhLnVtdS5zZS9DUFMwPwYIKwYBBQUHAgIwMxoxTGltaXRlZCBMaWFiaWxpdHksIHNlZSBodHRwOi8vd3d3LnN3dXBraS5zdS5zZS9DUDANBgkqhkiG9w0BAQUFAAOCAQEAjPbzGnpeXpzXuQGQeZA5aZqfxi/2R6osH94vLj0rDuSJk5mynCD5t+hgcqWOuD43VT++vBMGnDe060c9M3TyQA9ZsIxVivZArAfnb6bqgca9xB7DLOITBHhZeKgOjT/TUsfNBdZEILDbNmyOfhTgS97scfitAvCowIMwvsCmVTfFZwG5u1rJp4SpJwwZb/ekpkU6wLYRaLzkoZW8f5ivKKHJWud+iddkg71yMnMFigWQIRfNdaK+wz9oZwc+AyPwqz4u7BJlg4Z2SgKutjIwyMqLkm1g5Od5y1sF+Wpq5/mzK9FuS6oLzDSTmb3Q5IRbFzlTghqsLEsb3pRHXCrk/A==</ds:X509Certificate>
+ <ds:X509Certificate>MIIEOjCCAyKgAwIBAgICAd4wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wODAzMTIxNDEwNDFaFw0wODExMDcxNDEwNDFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggG5MIIBtTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFLWJ/IUQTsdgSBj3xq+hTSN2qZk5MH8GA1UdIwR4MHaAFHaQAcfvra4Asfdp2f4VKKzmMs5AoVukWTBXMQswCQYDVQQGEwJTRTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRMwEQYDVQQLEwpTd1VQS0ktUENBMRkwFwYDVQQDExBTd1VQS0kgUG9saWN5IENBggERMCoGA1UdEgQjMCGBCWNhQHVtdS5zZYYUaHR0cDovL3d3dy5jYS51bXUuc2UwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3d3dy5jYS51bXUuc2UvY3JsX3YyLmNybDB+BgNVHSAEdzB1MHMGCCqFcCsCAQEBMGcwJAYIKwYBBQUHAgEWGGh0dHA6Ly93d3cuY2EudW11LnNlL0NQUzA/BggrBgEFBQcCAjAzGjFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly93d3cuc3d1cGtpLnN1LnNlL0NQMA0GCSqGSIb3DQEBBQUAA4IBAQBjHF+0/RXKijMD2t6taOHp61TSP47fa/s9gD2H7mjlXKxwf2VHaN2mQ5Cy71atSzWpgfArCbND6lYLIaguDqkj+TtJAse3VBFe/nlaY5ewKxfaCLnnNGGNnoFaoVjTiZYrSYvSsqHjMmwIsgeAhVtAagkmB71B6QRL7nXwAJffNa1LVpVVI4e5T1tKa9BB5Z7LwqZSnC/MnBkNEU9h/Lw3gzIZyijNbnkOAVBnRf9gJwC8dHNafWhHyGj4urC2/GZIR+Mt+5HgQ2DKufHBjMv4a6edLS/gZFb4KfxmjgZDrb0ZC75Y9lcqiz8QZDXbu/4/ptMx7dNkEPfwJyuOD0TP</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
@@ -31,7 +31,7 @@
</IDPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">UU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Ume? University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-1.0/j6.lan.kth.se.xml b/swamid-1.0/j6.lan.kth.se.xml
deleted file mode 100644
index 06c92321..00000000
--- a/swamid-1.0/j6.lan.kth.se.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://j6.lan.kth.se/identity">
- <AttributeAuthorityDescriptor ID="role-26" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kth.se</shibmeta:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIB2TCCAUKgAwIBAgIJAIEPtGXHzF22MA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNVBAMTDWo2Lmxhbi5rdGguc2UwHhcNMDcwMjEzMTI0NjE2WhcNMDcwMzE1MTI0NjE2WjAYMRYwFAYDVQQDEw1qNi5sYW4ua3RoLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEIIrYAAktcfgMaw8CJSoY6lnAkj93H1NTfsxHMgTiH486hzsysETdr0Q9zfCL+EH//+rCyG90tML4AWu0lE/H2Sq81iibG2tnCV9pSYINvbGuO+1S1f9VNA5omwUhu+VVk3Rcpg9zzpF+YAhSEB0fEpqPyvyiDzIXg2SeS05DXQIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAEjqd743NwtmCz3K05dZ+emOpJWYCCEUvf45OkMiZ/xAebugjbr27/kwmvHO/Yz9sM5KtsFFsXEkGoV/uvbw2E3DRrnnaebenAF+y6BgYsqMvO4ucKErZlb39qrIaAkvyNtQF2hErjD9B4efwxecEgANKv5lN61z13Zjyd/Pwk6S</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://j6.lan.kth.se:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-27" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kth.se</shibmeta:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIB2TCCAUKgAwIBAgIJAIEPtGXHzF22MA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNVBAMTDWo2Lmxhbi5rdGguc2UwHhcNMDcwMjEzMTI0NjE2WhcNMDcwMzE1MTI0NjE2WjAYMRYwFAYDVQQDEw1qNi5sYW4ua3RoLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEIIrYAAktcfgMaw8CJSoY6lnAkj93H1NTfsxHMgTiH486hzsysETdr0Q9zfCL+EH//+rCyG90tML4AWu0lE/H2Sq81iibG2tnCV9pSYINvbGuO+1S1f9VNA5omwUhu+VVk3Rcpg9zzpF+YAhSEB0fEpqPyvyiDzIXg2SeS05DXQIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAEjqd743NwtmCz3K05dZ+emOpJWYCCEUvf45OkMiZ/xAebugjbr27/kwmvHO/Yz9sM5KtsFFsXEkGoV/uvbw2E3DRrnnaebenAF+y6BgYsqMvO4ucKErZlb39qrIaAkvyNtQF2hErjD9B4efwxecEgANKv5lN61z13Zjyd/Pwk6S</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://j6.lan.kth.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://j6.lan.kth.se/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">KTH</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Royal Institute of Technology</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>KTH</Company>
- <GivenName>Johan</GivenName>
- <SurName>Berggren</SurName>
- <EmailAddress>jbn@kth.se</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/jolu.dev.it.secure.su.se.xml b/swamid-1.0/jolu.dev.it.secure.su.se.xml
new file mode 100644
index 00000000..767250e3
--- /dev/null
+++ b/swamid-1.0/jolu.dev.it.secure.su.se.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jolu.dev.it.secure.su.se/shibboleth">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIB7zCCAVigAwIBAgIJAJ4RwLsrE8VvMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGpvbHUuZGV2Lml0LnNlY3VyZS5zdS5zZTAeFw0wODA1MTIwODAyNDhaFw0wOTA1MTIwODAyNDhaMCMxITAfBgNVBAMTGGpvbHUuZGV2Lml0LnNlY3VyZS5zdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqaabQgxKHFyHGXBa9TfOe9W/LbX9issL2lWtFaG5++KQMgcYOrFChkxyifmwJih+MJYoAaBZGWjDM/FfLyXe31flkC4uE1GScOGojtobRY9KcLR0XbHaxwPCSnkBOIncfEHuwOK9IUgCz1G8i4VGQm7lbIyijqPrt+aQXCePldUCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQBB6cbInUeuMbPM1WxT4xLKR4WF3lgIt5mqd/dpM6PySbW0d0+E+qkyhJeHFBhhHxFvnsaE9Y0hrIc862sCoe7EojgbFjV2SrqTrvQ4yVs/dXFZ0ipEli9wsc6RrgbVV9DRW6F2z7PSnw9Xi+wUm3vkvf/1/LqFU/sTz9Ek3zukHg==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jolu.dev.it.secure.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>SU</Company>
+ <GivenName>Joakim</GivenName>
+ <SurName>Lundin</SurName>
+ <EmailAddress>jolu@it.su.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/kurssystem.theducation.se.xml b/swamid-1.0/kurssystem.theducation.se.xml
index 30b8d295..e44a441e 100644
--- a/swamid-1.0/kurssystem.theducation.se.xml
+++ b/swamid-1.0/kurssystem.theducation.se.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<EntityDescriptor entityID="https://kurssystem.theducation.se/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurssystem.theducation.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-1.0/lab03.lab.it.su.se.xml b/swamid-1.0/lab03.lab.it.su.se.xml
index 99a71c51..de5f34af 100644
--- a/swamid-1.0/lab03.lab.it.su.se.xml
+++ b/swamid-1.0/lab03.lab.it.su.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lab03.lab.it.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-102" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/labs.swami.se.xml b/swamid-1.0/labs.swami.se.xml
index b9705e99..ce2437bb 100644
--- a/swamid-1.0/labs.swami.se.xml
+++ b/swamid-1.0/labs.swami.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://labs.swami.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-34" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/lists.su.se.xml b/swamid-1.0/lists.su.se.xml
index 63d447d2..f6d3fa6d 100644
--- a/swamid-1.0/lists.su.se.xml
+++ b/swamid-1.0/lists.su.se.xml
@@ -1,23 +1,23 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.su.se/shibboleth">
-<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-165" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-<KeyDescriptor use="signing">
-<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509Data>
- <ds:X509Certificate>MIIB1TCCAT6gAwIBAgIJAOsd1P/iHwDdMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2xpc3RzLnN1LnNlMB4XDTA4MDIxMjEyNTk0NVoXDTA5MDIxMTEyNTk0NVowFjEUMBIGA1UEAxMLbGlzdHMuc3Uuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALnNTH6G15SgAwQHMCa9FLJ4g/MnmZ+2Q0m8ZvXA5OKoLY+7vpH7XrojM2/ziobcPK+pE5UNaNOpVffBUFtibabgXs2N7BUDJWjcvRqk5rxmEoMd1mCRQ6WOATBPdSkZ3xFvs0yy5y+1xRNsBji7gb326dHS/WUIDAw/62dCLG5PAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAH7Ml0chViQ1GTX4RkL/S8bJpELYqTNBZ7+s7wMOwPF/TxJKeC6yFCkFKx4Ts8uGuJ3Bo3MsetTTUe24WD5aRO76k6p7y/HPs+nk0e0VJKz3NSktKGE/uXt59B/ax1tdVOMuZTGV9GwwlgHOMapYOBylI7Nriufub8Cgtwf4VwgQ=</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-</SPSSODescriptor>
-<Organization>
-<OrganizationName xml:lang="en">SU</OrganizationName>
-<OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-<OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-</Organization>
-<ContactPerson contactType="technical">
-<Company>Stockholm university</Company>
-<SurName>helpdesk</SurName>
-<EmailAddress>helpdesk@it.su.se</EmailAddress>
-</ContactPerson>
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIB1TCCAT6gAwIBAgIJAOsd1P/iHwDdMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2xpc3RzLnN1LnNlMB4XDTA4MDIxMjEyNTk0NVoXDTA5MDIxMTEyNTk0NVowFjEUMBIGA1UEAxMLbGlzdHMuc3Uuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALnNTH6G15SgAwQHMCa9FLJ4g/MnmZ+2Q0m8ZvXA5OKoLY+7vpH7XrojM2/ziobcPK+pE5UNaNOpVffBUFtibabgXs2N7BUDJWjcvRqk5rxmEoMd1mCRQ6WOATBPdSkZ3xFvs0yy5y+1xRNsBji7gb326dHS/WUIDAw/62dCLG5PAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAH7Ml0chViQ1GTX4RkL/S8bJpELYqTNBZ7+s7wMOwPF/TxJKeC6yFCkFKx4Ts8uGuJ3Bo3MsetTTUe24WD5aRO76k6p7y/HPs+nk0e0VJKz3NSktKGE/uXt59B/ax1tdVOMuZTGV9GwwlgHOMapYOBylI7Nriufub8Cgtwf4VwgQ=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Stockholm university</Company>
+ <GivenName>Helpdesk</GivenName>
+ <EmailAddress>helpdesk@it.su.se</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/mars.dc.kau.se.xml b/swamid-1.0/mars.dc.kau.se.xml
deleted file mode 100644
index 55e73160..00000000
--- a/swamid-1.0/mars.dc.kau.se.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mars.dc.kau.se/identity">
- <AttributeAuthorityDescriptor ID="role-21" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
- <Extensions>
- <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kau.se</shibmeta:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIB2zCCAUSgAwIBAgIJAP0MXVpvKE/FMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDm1hcnMuZGMua2F1LnNlMB4XDTA3MDEyMzE0NTYyOFoXDTA3MDIyMjE0NTYyOFowGTEXMBUGA1UEAxMObWFycy5kYy5rYXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMYZNIOHFJ3FU1OcCx+y0SlhkxYw0AeHUrG5Qv+J1nXVyumOgGsxIgYDyYU74z7Y7zcEdWG21u3swxah3k13i3SuczjfI1+JMGNWsa45Bzbu0FOoPvV1dhehqP7TYZxSJBklhXfL7MFUZ2LrTSJXgUxOq1lQ1JQM/fFwel0IL1IpAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAlU1+H13uYvoQrjH1HogW2/5nxhRe90deyxToyVtvQyGVoiWKYxnsNze9xY4kZTfOOpXmb5LdVafeZ0W1SEZkFaraydLNlLy53fzYD7E+B5DJtO3zE5J0QxVpbV692++5v4sBgop5WOjSC634unDgw4NAxoCO+CWmIHuaouoJUts=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mars.dc.kau.se:8443/shibboleth-idp/AA"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- </AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-22" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
- <Extensions>
- <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kau.se</shibmeta:Scope>
- </Extensions>
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIB2zCCAUSgAwIBAgIJAP0MXVpvKE/FMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDm1hcnMuZGMua2F1LnNlMB4XDTA3MDEyMzE0NTYyOFoXDTA3MDIyMjE0NTYyOFowGTEXMBUGA1UEAxMObWFycy5kYy5rYXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMYZNIOHFJ3FU1OcCx+y0SlhkxYw0AeHUrG5Qv+J1nXVyumOgGsxIgYDyYU74z7Y7zcEdWG21u3swxah3k13i3SuczjfI1+JMGNWsa45Bzbu0FOoPvV1dhehqP7TYZxSJBklhXfL7MFUZ2LrTSJXgUxOq1lQ1JQM/fFwel0IL1IpAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAlU1+H13uYvoQrjH1HogW2/5nxhRe90deyxToyVtvQyGVoiWKYxnsNze9xY4kZTfOOpXmb5LdVafeZ0W1SEZkFaraydLNlLy53fzYD7E+B5DJtO3zE5J0QxVpbV692++5v4sBgop5WOjSC634unDgw4NAxoCO+CWmIHuaouoJUts=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mars.dc.kau.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mars.dc.kau.se/shibboleth-idp/SSO"/>
- </IDPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">KAU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Karlstad university</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Karlstad university</Company>
- <GivenName>Paul</GivenName>
- <SurName>Scott</SurName>
- <EmailAddress>paul.scott@kau.se</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/mondo-web.it.su.se.xml b/swamid-1.0/mondo-web.it.su.se.xml
index 332a19c3..48887aef 100644
--- a/swamid-1.0/mondo-web.it.su.se.xml
+++ b/swamid-1.0/mondo-web.it.su.se.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<EntityDescriptor entityID="https://mondo-web.it.su.se/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mondo-web.it.su.se/shibboleth">
<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-1.0/mondo.su.se.xml b/swamid-1.0/mondo.su.se.xml
index 41eb5a69..bb3dab04 100644
--- a/swamid-1.0/mondo.su.se.xml
+++ b/swamid-1.0/mondo.su.se.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mondo.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-99" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB1TCCAT6gAwIBAgIJAPSVwvaXb39ZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC21vbmRvLnN1LnNlMB4XDTA3MDUwMjA3NDIwM1oXDTA4MDUwMTA3NDIwM1owFjEUMBIGA1UEAxMLbW9uZG8uc3Uuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALjb5Ti1RkHkNqQqST536YUy5SV0h4/28fSvLhHfMjMpX705XDyuTl/AvVXBvns+1wpR+XKQUChemohQwpiv++bRciBbttVZmmTDokVEzDkb75yrxZT0bjHTBYQtC1s3t3y0daU1sZtpxR+JY0ZvIUrE2rxt/a83nAoFsRL0cqZLAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAPEYdOAVBhGtobU+RTlI2vHVg1fx8b1o86ihiOyCluwOlj5OFN1YCDV8l0qcx3HJn7SvAM/jlHLaDUxNcdTzpUOfaaspuGRsojx7IobzEparTdUhbNyvtgdrhK8anlCjvKuH9Zl9mTj/iQYRC1qn91SWqc4zFEa2W2sM2qPkK8Nw=</ds:X509Certificate>
+ <ds:X509Certificate>MIIEqDCCA5CgAwIBAgILAQAAAAABF+lM7GUwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDIwNTExMTMyOFoXDTExMDIwNTExMTMyOFowWDELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEUMBIGA1UEAxMLbW9uZG8uc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClSBJoeuabz4UK5mlbnydJ2ETrTVWhvpxIeRWXaeuHZHVLDaN2OBy8aLAePUrjtQpVhDFzZJTaqXdXW69R8hnMi+e7/AWXErrgAHxzISqBzYWINR3NxUHuMKmrYrx2FAB/GHE5kcyXhK+FFOO9QHoKGnsY4C5eNy+LEQy85vN7TZbbynJh+wz1Zt/dFCRsG4wjAJ/LKgnzbCOTpStPWBFBs5LwROQfAKeat2J988FRePNk8mpJV3Ul9/mLuFTxTkQH0IsyVe5FFxuDgOleMVY/DPkwusTnbfH6romQ4MGgZjC+868AS4DQZD+6FlPHbo5Exff7e+gz8Ix/dEQf6539AgMBAAGjggFqMIIBZjBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBQRIAkpF6sLIzBkXpn7H6dKD+rxqzA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwFgYDVR0RBA8wDYILbW9uZG8uc3Uuc2UwDQYJKoZIhvcNAQEFBQADggEBAAqtgxC6/5zH9LRXhegr4kfa2FOzPMoxzvzRB4r9WO+57xD2ssX+qufIKZwHxV7zllI8WVq4U85KOkrxxqXn3arv8DRkw5zR0nYVKjkhl/ufWHqUARag8hn14nTDJvvnoRfoV5eq0xP7EYEBg0b67riujYbVpMNQ/OKK+DOKr2bPOv966GyUfX/5hlu1rweOixOcS7kOV+jCkPu80xElv+ARBhqn+4qph6WngFNh4Z/zrnJpuBYHmywmv873kFPauHEZukzFRNCgfmmQhz6OzXSBhT0JpuZG3SbXAtW7g1UMUd+NsTJzMXfPbh1y04GkC1KJmzcqNYuc2L04Q3mNwRY=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
diff --git a/swamid-1.0/moodle.lhs.se.xml b/swamid-1.0/moodle.lhs.se.xml
index 73ec08e0..5c77c83c 100644
--- a/swamid-1.0/moodle.lhs.se.xml
+++ b/swamid-1.0/moodle.lhs.se.xml
@@ -1,23 +1,23 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://moodle.lhs.se/shibboleth">
-<SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-165" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-<KeyDescriptor use="signing">
-<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509Data>
-<ds:X509Certificate>MIIDLjCCApegAwIBAgIJAIOhlx0RWyX4MA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEWMBQGA1UEAxMNbW9vZGxlLmxocy5zZTAeFw0wODAxMjMxMjQ4MTNaFw0wODAyMjIxMjQ4MTNaMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEWMBQGA1UEAxMNbW9vZGxlLmxocy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuby+BkQmFbdsQKRStXSMzaClKsGdXhuWsetQIeie7z83f4GtsrtPztKEHrry8zNwnlV8zAnYD1Q/IfU+Rfcses4ytZDbKW+HwzLKC06GiLwGv4OYwcE7+CyoeQIWK8QHEq8ZKfWk8ZuGcGjANzxnoh6DzsF9tu5L3lVTkgWKDHMCAwEAAaOB0zCB0DAdBgNVHQ4EFgQUxIkfkJ8fvPNUq14fFv4Qjaa0x0MwgaAGA1UdIwSBmDCBlYAUxIkfkJ8fvPNUq14fFv4Qjaa0x0OhcqRwMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEWMBQGA1UEAxMNbW9vZGxlLmxocy5zZYIJAIOhlx0RWyX4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAsAHWAtgsfoR7b7lbYMhDcmuDL8v+TPZyF3baYNHsHO97nqgX13DvsgFBJHE1Cp3MMClOH0h3zZX6gAG0nzEW1L87A5NHjqInX8c+vezF9p61GQIHgpPBKMmFzMTGsOdktRrAaGBnrflbmj5ymmRyAzUeYrP+aXmjeRjDYPix8jU=</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.lhs.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-</SPSSODescriptor>
-<Organization>
-<OrganizationName xml:lang="en">SU</OrganizationName>
-<OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-<OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-</Organization>
-<ContactPerson contactType="technical">
-<Company>Stockholm university</Company>
-<SurName>helpdesk</SurName>
-<EmailAddress>helpdesk@it.su.se</EmailAddress>
-</ContactPerson>
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIB0TCCATqgAwIBAgIBADANBgkqhkiG9w0BAQUFADAYMRYwFAYDVQQDEw1tb29kbGUubGhzLnNlMB4XDTA4MDIyMjE0MzkxOVoXDTA5MDIyMTE0MzkxOVowGDEWMBQGA1UEAxMNbW9vZGxlLmxocy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzzVzgzeldd6S3cBGvp92U0aYNZ6eenbJNlQvKHdZexW8Tecv1Ev5Q/6XfTI0K93D0+CdXz1zkYefkiIMOzMTN/Q21YfBaWQPkXLfWPM+bKtPtJcB0nS9VWwNYrh1oK1btsuZ3xWTVMyhXNsOohaI8jzvoLNM8w7sinb5udsx7LUCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQB9n+d91riIB4efehIYDK8c01KXh1icoE2vwwgMyPRTMH0GZodydgzBe2xK3u5veXNYKBenKQGqUVHGyX9QfWP5fodFdGITeGINPFP10WybcA+bZUwjBDgWLygJREzdsiSjYA4AvwIiVht8Z4iP1NMJqS5/FnAwHCcNE5aAmuxMSA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.lhs.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Stockholm university</Company>
+ <SurName>helpdesk</SurName>
+ <EmailAddress>helpdesk@it.su.se</EmailAddress>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/pp-admin.it.su.se.xml b/swamid-1.0/pp-admin.it.su.se.xml
new file mode 100644
index 00000000..aa5559cf
--- /dev/null
+++ b/swamid-1.0/pp-admin.it.su.se.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp-admin.it.su.se/shibboleth">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEtDCCA5ygAwIBAgILAQAAAAABGexP22YwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDUxNTExMjA1OFoXDTExMDUxNTExMjA1OFowXjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEaMBgGA1UEAxMRcHAtYWRtaW4uaXQuc3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6OjuBsS+ovpRix7TUGMEcb+i2oovl8ByI4/zVEhEnxx5+Ge87eWcmysYeWad+HubtiZY72lcaOwCAb4LBKwHr7EzoJeF7+fw4AfprJvbBvsPcc0OMCqzqDrw6PgXizNsQV8e4PaWEKCQctkRaUAxW62rWhJh2rHMy4EIostzUNlZpwQpy78VLylAVCCM1vPJJY0w6D0PJYW6i8kpjzafaghpkNjO0rMNK+gZpW+T6oIwE5cwfKUb0hIBWC8eyczpG7bpp3Vz/Wj8aKcNPsUAMv49qKKNs+J87rQ/BnWaTvFPT65UVdxDuFmtF+pZs0pkhd9zsTjgd7/3smOuBRTzpAgMBAAGjggFwMIIBbDBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBRMpoJHRqciKnJu7I96P/+zer9o3jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHAYDVR0RBBUwE4IRcHAtYWRtaW4uaXQuc3Uuc2UwDQYJKoZIhvcNAQEFBQADggEBAI3W3fQlz6aTvGwzQkGF1jAwCUruHjj2/Zmxyt1SiagyGDPx0SMIEm6QygWe64UgFmGOrql3eAE/4N7XfqMq6Ue4LO72I3Td6cDKVmR8jO0cjl4Uz0p4FL0gfIB/4HF7fEOGep+0LqITKt5DhG7N43naV+ZYkP0wXzfwFZhkKb95bH3csPGqAs4pwULQpD4bskN9IrwQZeSOsWHOVmrO/6T81W3zrqLwEwx1b9CRteuF6UlKHPSYCcsodl53PLCnAZU8MKXnzGN94d34gg88Es2F4XY6ulPwlr+wKBTlb0lZSH9ScgjSm3uKikSb2S57pLREth398dCkAXSBVbwL3Cg=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pp-admin.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>SU</Company>
+ <GivenName>SU Helpdesk</GivenName>
+ <EmailAddress>helpdesk@it.su.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/public.it.secure.su.se.xml b/swamid-1.0/public.it.secure.su.se.xml
index f7746add..acf32629 100644
--- a/swamid-1.0/public.it.secure.su.se.xml
+++ b/swamid-1.0/public.it.secure.su.se.xml
@@ -4,10 +4,7 @@
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB6zCCAVSgAwIBAgIJAKNcH+FrOWHNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnB1YmxpYy5pdC5zZWN1cmUuc3Uuc2UwHhcNMDcxMjI3MDkzMTE2WhcNMDgxMjI2MDkzMTE2WjAhMR8wHQYDVQQDExZwdWJsaWMuaXQuc2VjdXJlLnN1LnNlMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDJKFpdqgQoieXBGvG55dAuwXeI3q3BvxJ27RUKUWHmPmP+HLauyHljQ+hzDl6KR+8N74r5T1q6DsAVsmbl/IBFC9KogU8Bz5Rjt29kavPpoVAV1zcFIvY2G2kJD9hSJz9oMFJr7nkklA9NWx/sv0eFi+qfXoUptKeSLg1u2uU3QIDAQABoyswKTAn
-BgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAE/mkD3hbAtnSysM6c7K6VEO4o+FabBKdHjsehK3rkEndQi9o0GLU68k6xcV5RKfxleuz/WPbyoC0W9qKBAH4y4F0OtD9FZrjJrrsAoieQehvSdjpLIonFWwznH7C7aTOfeY3NWoaMqy
-z0LyQ7ILHPscwxRXeBCMLYUp13/4acu8</ds:X509Certificate>
+ <ds:X509Certificate>MIIB6zCCAVSgAwIBAgIJAKNcH+FrOWHNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnB1YmxpYy5pdC5zZWN1cmUuc3Uuc2UwHhcNMDcxMjI3MDkzMTE2WhcNMDgxMjI2MDkzMTE2WjAhMR8wHQYDVQQDExZwdWJsaWMuaXQuc2VjdXJlLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDJKFpdqgQoieXBGvG55dAuwXeI3q3BvxJ27RUKUWHmPmP+HLauyHljQ+hzDl6KR+8N74r5T1q6DsAVsmbl/IBFC9KogU8Bz5Rjt29kavPpoVAV1zcFIvY2G2kJD9hSJz9oMFJr7nkklA9NWx/sv0eFi+qfXoUptKeSLg1u2uU3QIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAE/mkD3hbAtnSysM6c7K6VEO4o+FabBKdHjsehK3rkEndQi9o0GLU68k6xcV5RKfxleuz/WPbyoC0W9qKBAH4y4F0OtD9FZrjJrrsAoieQehvSdjpLIonFWwznH7C7aTOfeY3NWoaMqyz0LyQ7ILHPscwxRXeBCMLYUp13/4acu8</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
diff --git a/swamid-1.0/roundup-test.it.su.se.xml b/swamid-1.0/roundup-test.it.su.se.xml
new file mode 100644
index 00000000..9c9abcda
--- /dev/null
+++ b/swamid-1.0/roundup-test.it.su.se.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://roundup-test.it.su.se/shibboleth">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEvDCCA6SgAwIBAgILAQAAAAABHEtYz+8wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDkxMDA4MjAyM1oXDTExMDkxMDA4MjAyM1owYjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEeMBwGA1UEAxMVcm91bmR1cC10ZXN0Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuWia8Li3lAlfEHtajbEj7JE3xX31jtPI8mWIbrv82bM1UqfJNFOtrYoukrOLwB8y/trTytPxNOykhAEOK8uElNIJWvrmpe2Upmn/yAxT+7FT8RYECh558rLYdwE7RKiu9W4W/mztFKXGTVsG6c0PmUh+bchTW7XikyqhuvyHaYBZ2Qf+mMMk4No0qCtLakjvWaMXEEJRSEMiMPXBkkpaaAwBVc9baK0+EYuTKII2L4tx2eNSzposXqj2lSks70tHsJnTHUBYeVZiVPYpeu34kO/0NPBeq9CFgk49aHZpuq+iQBx/BX1I2Z5iRV+UY0eZpENVapWf6M1nYz6h7HcXUQIDAQABo4IBdDCCAXAwUAYDVR0gBEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUdj87P0v1GpRPfbrHmKPY4EvzN8AwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCAGA1UdEQQZMBeCFXJvdW5kdXAtdGVzdC5pdC5zdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEAiRmbVYXHgEs6d68zfqAsHBLUGrysmZkJnx1603o5CbMxG0DSVtUPWL9artz68/dazxvI4zdrkxNb9j8mHTOZ6jYYon3VwI4d4RSjuXtRTfa+Tc9qGsi79U7ALH4RgFp6ltAZL+r3vKFKwWnD5ToXtm0S3ih8LUxtKNpTb3mlv2Ib8nCcsmR91y+Dl0ypgxp/Kqoi0jEcijffZXkfzmKmcOlsbrBZw4BJzogHVTdGFj3P5oJy13h+oldS7kwYljI2h7Z+BVMmrSguWTgqbErhQInbOiZggQhfB3x70OdJs4DDrMzSQctqEXlj+Eb7qSdYyuP1kMjI1P+0IGLq+PSN6A==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://roundup-test.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>SU</Company>
+ <GivenName>Klas</GivenName>
+ <SurName>Lindforss</SurName>
+ <EmailAddress>kllin@it.su.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/roundup.it.su.se.xml b/swamid-1.0/roundup.it.su.se.xml
index 85da43e7..14aea8e4 100644
--- a/swamid-1.0/roundup.it.su.se.xml
+++ b/swamid-1.0/roundup.it.su.se.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://roundup.it.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-77" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB6TCCAVKgAwIBAgIJAOUMrdy3c3YrMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMTFXNoaWItcm91bmR1cC5pdC5zdS5zZTAeFw0wNzAzMTYxMzEwMDZaFw0wODAzMTUxMzEwMDZaMCAxHjAcBgNVBAMTFXNoaWItcm91bmR1cC5pdC5zdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxIp+5/Y9Ihx7rT85dYJIUbKN+BIP5bJL7Ixy1cuYxyx5J717vvT59GrYMKBod3L7ByROv4WPo4quPrW/Nk7gsRxZeLChgaY+g5eD8jf5OZH2QCAoqh4V6rELDXd/RgsjVyN0m8EOZuVeeD4VGNisVGbDBLgJ46mhgnjj6HqX3LsCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQBHcdCluKWXUv+XzZbQfmTiu5y/YO6DWDoaTBDAcNII7aXKZEPcc5HdpUYNvIElJeRwn0H2n20P0WwwCEQOt/hB3ve371JIOhnuMObILIWIL3DnwpsWfgvvDPjLXwNYvKBWuk3+/midRNwC2xYwqhTBdGlgmofS1X4rreLbExCF8Q==</ds:X509Certificate>
+ <ds:X509Certificate>MIIDbTCCAlWgAwIBAgIJANbxBppDW3WQMA0GCSqGSIb3DQEBBQUAMC0xCzAJBgNVBAYTAlNFMR4wHAYDVQQDExVzaGliLXJvdW5kdXAuaXQuc3Uuc2UwHhcNMDgwMzE3MDkyMjUwWhcNMTAwMzE3MDkyMjUwWjAtMQswCQYDVQQGEwJTRTEeMBwGA1UEAxMVc2hpYi1yb3VuZHVwLml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzfArE1PtdXywNARmL3st18I5GofeADtilz3/jzEmYg6a3/fK3mL0xvADBs0ulxL6T9qeGFZWA/APbBYO5/MP8FDsL+Mr1PVN2um4SFKpQdFym0MbJmb4qUZVKfPDcpI4dWgWZPItGA9uzzDxSKYjejWJOvgdycN8yt+rj5lwjCGHNo+/B4pAJpWFTaYZnV4bMvcin+TXib+2ome0HL+kC0ul7Vg/hLNqyOk7GbAsDuPbYzE7wIqFa3QoVDHPja5yq/UIttmOJiw7gcWJheWRCYBiMTOGCEvng+2jsxoNEM+PGSoBDWvoXY01yV9R8sMbJv5YyauDwEeVltHm47S2WwIDAQABo4GPMIGMMB0GA1UdDgQWBBSvWbE1iQBrDVnhe0JdJ+UrgKsCUTBdBgNVHSMEVjBUgBSvWbE1iQBrDVnhe0JdJ+UrgKsCUaExpC8wLTELMAkGA1UEBhMCU0UxHjAcBgNVBAMTFXNoaWItcm91bmR1cC5pdC5zdS5zZYIJANbxBppDW3WQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIIYR616CkgU6xlxM37KlBmrN6Dp2rU4VagC0OhkkqDa3Kt2AdOG11z1SEguKDygQT1oMztIVewIhgaq2ggF+WqqLWWfWHAi+ff/b0MOZICXlwQJPJXywXvqFgM2mEi0hMV8bITh8l3wFuO0aq6zaXlZv0XtmF8ac8Rx68DvX0n53fBI2yZ6d9Jcl2hxRtBOvUW/S8AbI8NQST1HBKnYGGX01nT7ShCXlP5hzki9PDu0gw/Z9LjvQT5KA/rkg2hHykqk7j4TYe5RyU43pkKi+Urf+RPS/6KmBqxzIfwceeUIIvou+42OK1Yhc9WcDgfxXh/BD83L74pey0npGc/X9R4=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
diff --git a/swamid-1.0/sakailab1.it.secure.su.se.xml b/swamid-1.0/sakailab1.it.secure.su.se.xml
index 9e700f70..aeb0227b 100644
--- a/swamid-1.0/sakailab1.it.secure.su.se.xml
+++ b/swamid-1.0/sakailab1.it.secure.su.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sakailab1.it.secure.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-71" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/sakailab2.it.secure.su.se.xml b/swamid-1.0/sakailab2.it.secure.su.se.xml
index dcf34985..3fa53cf1 100644
--- a/swamid-1.0/sakailab2.it.secure.su.se.xml
+++ b/swamid-1.0/sakailab2.it.secure.su.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sakailab2.it.secure.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-96" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/samsok.libris.kb.se.xml b/swamid-1.0/samsok.libris.kb.se.xml
index 5dcc5778..e507fb1b 100644
--- a/swamid-1.0/samsok.libris.kb.se.xml
+++ b/swamid-1.0/samsok.libris.kb.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://samsok.libris.kb.se/shibboleth">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-153" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/secure2.kau.se.xml b/swamid-1.0/secure2.kau.se.xml
deleted file mode 100644
index 482a2261..00000000
--- a/swamid-1.0/secure2.kau.se.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure2.kau.se/">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-15" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIB0zCCATygAwIBAgIBADANBgkqhkiG9w0BAQUFADAZMRcwFQYDVQQDEw5zZWN1cmUyLmthdS5zZTAeFw0wNzAxMjMxMzU4NDdaFw0wNzAyMjIxMzU4NDdaMBkxFzAVBgNVBAMTDnNlY3VyZTIua2F1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCw9PhNns+MMJ3HF2YYul8lFj9sU6FaqSR10YZ6BBZdteFvwH1IroHjOTMayEQKR2B6oy4KZkJ/afIMP7djNvWyBZN1EMeWqciG/oQO0TcF5xacuHoZYUnDxsDRB6y/9U+uod3llWFHlmCSR5565fS8C0B6g/dO8jpwB9Tqtg94bwIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBACSs01ur3+kGnctTBUQxmNMp57SSGBKwaY8FwgCsguAgHgIK8BYjuh7rpSOAwHTsbIujO7hD29EbUPw7Ez6ePcUwCow8MPYWuUSDB/rOjJpcK5fMF9QX1EkeinJ15ZCz5NnTYAirtDlS2w7jr6dTyBOhEZia2PsqPDoln7QsW8xu</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure2.kau.se//Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">KAU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Karlstad university</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Karlstad university</Company>
- <GivenName>Paul</GivenName>
- <SurName>Scott</SurName>
- <EmailAddress>paul.scott@kau.se</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/shib-idp.kau.se.xml b/swamid-1.0/shib-idp.kau.se.xml
new file mode 100644
index 00000000..57e1583f
--- /dev/null
+++ b/swamid-1.0/shib-idp.kau.se.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.kau.se/identity">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kau.se</shibmeta:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEPTCCAyWgAwIBAgILAQAAAAABGTNtk4cwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDQwOTEzNDM0OVoXDTExMDQwOTEzNDM0OVowbTELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9zaGliLWlkcC5rYXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKOQIKbkk/FiMrF0SnFnN+leGueG0+qQMczfPQuUkTp1y+nhtIuvD+3t2pzPsuUcHtArrJjBKPg3Mp5Tt8cHWNdRl1j6l0TN1Rtk+1rmyMck5HZp1b296ldPtyCzon/txPB356CiT6KvW/iHY0hAiupIKdlWLK360ZGqThCPext1AgMBAAGjggFuMIIBajBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBRUfoCGld9kbPhwSgnkIMv3jWpxODA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGgYDVR0RBBMwEYIPc2hpYi1pZHAua2F1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAI/dNIi3iuS6nw4Tll1ZCc3kuHyG5In67CmtjO0owGmkh/4+B+ZHA37U5SZeKYPliiNqjUX6rlz4WYtvj/wFcAXSbcbgVRWkCVTkYahWL4DysGEanzeTJvWgcnJXix1JO6nifJYw8nJEBhuZrmrEuDj/5EmkekkGxRgGA9QgLSsYCnzkcm71R3PNO+rvSiBzY8MeIgiS96Jpe09iafVA0/w1Q8pyhLdLa8KWl80Rjjo/JVi34LECLwq9emIXIxNTr6ot3WdamoIZtEVOVbdwPoEAlekE87VJ2w7Y/yMqFz6bLp4cQ91PQZG91Y2NtQY4RBFCci5LO0dlcJTF2kMxkT</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.kau.se:8443/shibboleth-idp/AA"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ </AttributeAuthorityDescriptor>
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kau.se</shibmeta:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEPTCCAyWgAwIBAgILAQAAAAABGTNtk4cwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDQwOTEzNDM0OVoXDTExMDQwOTEzNDM0OVowbTELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9zaGliLWlkcC5rYXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKOQIKbkk/FiMrF0SnFnN+leGueG0+qQMczfPQuUkTp1y+nhtIuvD+3t2pzPsuUcHtArrJjBKPg3Mp5Tt8cHWNdRl1j6l0TN1Rtk+1rmyMck5HZp1b296ldPtyCzon/txPB356CiT6KvW/iHY0hAiupIKdlWLK360ZGqThCPext1AgMBAAGjggFuMIIBajBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBRUfoCGld9kbPhwSgnkIMv3jWpxODA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGgYDVR0RBBMwEYIPc2hpYi1pZHAua2F1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAI/dNIi3iuS6nw4Tll1ZCc3kuHyG5In67CmtjO0owGmkh/4+B+ZHA37U5SZeKYPliiNqjUX6rlz4WYtvj/wFcAXSbcbgVRWkCVTkYahWL4DysGEanzeTJvWgcnJXix1JO6nifJYw8nJEBhuZrmrEuDj/5EmkekkGxRgGA9QgLSsYCnzkcm71R3PNO+rvSiBzY8MeIgiS96Jpe09iafVA0/w1Q8pyhLdLa8KWl80Rjjo/JVi34LECLwq9emIXIxNTr6ot3WdamoIZtEVOVbdwPoEAlekE87VJ2w7Y/yMqFz6bLp4cQ91PQZG91Y2NtQY4RBFCci5LO0dlcJTF2kMxkT</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.kau.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.kau.se/shibboleth-idp/SSO"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">KAU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Karlstad university</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Karlstad university</Company>
+ <EmailAddress>paul.scott@kau.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/shib-sp.kau.se.xml b/swamid-1.0/shib-sp.kau.se.xml
new file mode 100644
index 00000000..a3100a60
--- /dev/null
+++ b/swamid-1.0/shib-sp.kau.se.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp.kau.se/shibboleth">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEOzCCAyOgAwIBAgILAQAAAAABGZV7kNAwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDQyODE0NDE0MloXDTExMDQyODE0NDE0MlowbDELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQDEw5zaGliLXNwLmthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWLmt/yXGpvZePRdurs9d88gTVDwLlDXBjTqTIKVjSqLL/e2wcf4KVySNd1DM2/GDf1+w5GA+gnqsjLHjER98tZIKJ9k8M3Euj1eZGdOnqDmYBd1lv7aqny1H6HI6jGaDzLWh+lyTEZYGVToMPAEqjoa4JL9UVxe8NDf7QUYSfUCAwEAAaOCAW0wggFpMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFMvK6U7CjAuzqDcmFPeN7/Z2O64rMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZBgNVHREEEjAQgg5zaGliLXNwLmthdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEANiuwG1H0856K8Fyw42L21cA3OpGAgWGYQ8AM+wPlmxIKj8eWWNOgR/xSDNLbSVKBLY76bSLNeDbTpodz0Dxhepv0GEnUWic9qNK7mp3Y0swNLMlr3KvRpoSc3zNqjHu7DeAJvXQO+iiXdLQnwegCEaXPj6HXKOo4nETG43KW3GNLO8fAaCHnBDZqIgBqx/3jCIgIBtwZwAN6F92LTVYkzso6gi9Y15LDkqTUWuw0rTnM2xG/ceXxiLGJJ8cDVhvBpTKTedD6cslNY9DFOXyfbuToQv+4ZyCpYnnGc92CSU0AWmIabqfHozHN6aq9oGzD+/bgg5TSRP6yvb/RQgPICQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.kau.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">KAU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Karlstad university</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Karlstad University</Company>
+ <GivenName>Paul</GivenName>
+ <SurName>Scott</SurName>
+ <EmailAddress>paul.scott@kau.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.ebscohost.com.xml b/swamid-1.0/shibboleth.ebscohost.com.xml
index dd901f8a..9406fba5 100644
--- a/swamid-1.0/shibboleth.ebscohost.com.xml
+++ b/swamid-1.0/shibboleth.ebscohost.com.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-119" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/shibboleth.sys.kth.se.xml b/swamid-1.0/shibboleth.sys.kth.se.xml
index 569973af..16fa1c95 100644
--- a/swamid-1.0/shibboleth.sys.kth.se.xml
+++ b/swamid-1.0/shibboleth.sys.kth.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.sys.kth.se/identity">
- <AttributeAuthorityDescriptor ID="role-26" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kth.se</shibmeta:Scope>
</Extensions>
@@ -14,14 +14,14 @@
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sys.kth.se:8443/shibboleth-idp/AA"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
</AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-27" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kth.se</shibmeta:Scope>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB6TCCAVKgAwIBAgIJAOWxnEiImxnuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTAeFw0wODAyMDcwMDI4MDFaFw0xMTAyMDYwMDI4MDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsoH589Je8tY9QKR4fdR5IMw+EOAsGNETKCdap9hqbSKSX5cG8xsJ3wjgxwbe9LbiboKk8GwxU/iSuxtzIa+myfeFkgL/IR0En6lyFvPnJxcNOV2fAVlForH2OPrt/WxeP9AzkzyjzrjOtH6mi4pT7jiHjxKWX7L6vB7rgyTJjHsCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQB3Ktsl6UYCV5YRwJ/gnHndiiUR/kOdaJaC0sv5C1f+uNdBGxJqz6h8W4rKXv6B4m/oDyZY0P7GYY1bZ2fMTnTfVF5MsCscURIIHz8bo+/LoYp/fRQSm/AG2Xz3vJFEMFtKXoGvi9VgcSS1BoBAn2I9oxZTNmTxlmkocYMYXdMopA==</ds:X509Certificate>
+ <ds:X509Certificate>MIIB6TCCAVKgAwIBAgIJAOWxnEiImxnuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTAeFw0wODAyMDcwMDI4MDFaFw0xMTAyMDYwMDI4MDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsoH589Je8tY9QKR4fdR5IMw+EOAsGNETKCdap9hqbSKSX5cG8xsJ3wjgxwbe9LbiboKk8GwxU/iSuxtzIa+myfeFkgL/IR0En6lyFvPnJxcNOV2fAVlForH2OPrt/WxeP9AzkzyjzrjOtH6mi4pT7jiHjxKWX7L6vB7rgyTJjHsCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQB3Ktsl6UYCV5YRwJ/gnHndiiUR/kOdaJaC0sv5C1f+uNdBGxJqz6h8W4rKXv6B4m/oDyZY0P7GYY1bZ2fMTnTfVF5MsCscURIIHz8bo+/LoYp/fRQSm/AG2Xz3vJFEMFtKXoGvi9VgcSS1BoBAn2I9oxZTNmTxlmkocYMYXdMopA==</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
@@ -35,9 +35,7 @@
<OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
- <Company>KTH</Company>
- <GivenName>Johan</GivenName>
- <SurName>Berggren</SurName>
+ <Company>Royal Institute of Technology</Company>
<EmailAddress>jbn@kth.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/shibboleth.testc.ladok.umu.se.xml b/swamid-1.0/shibboleth.testc.ladok.umu.se.xml
deleted file mode 100644
index b3f589ad..00000000
--- a/swamid-1.0/shibboleth.testc.ladok.umu.se.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.testc.ladok.umu.se/identity">
-<AttributeAuthorityDescriptor ID="role-168" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-<Extensions>
-<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">studera.nu</shibmeta:Scope>
-</Extensions>
-<KeyDescriptor use="signing">
-<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509Data>
-<ds:X509Certificate>MIIC/jCCAeagAwIBAgIJAMXBqFyzE+eyMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTA4MDExMTExMTg0NloXDTE4MDEwODExMTg0NlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDuOJy8znIq+12hFWckc2W4ghjWa8ltdyM850ty7pgetqFWg5lDO0GLRJSRne9eth0xowH4h9PcBa1Y+wKV71MiU5QHX+k3nyreN+HjxJ2vki0DD0fW5D3EdpXW/bHyQZ/R5v4dgGjevgsuGNJMB2ncJhVELIe/XJZotW86r973aYVnsadEy3XuYi6mvCm60OYk44H2IC2lx9wbmfA843ckSHTU75UvWKlfIAFFuMKZzP9XNIZVeHIvSxV3fNe1hrE82Otvz5t4avLbEXnsD/GWqnlYyaJ9IQksR240fLWs+3wB9IFRZ63BnFCwVDoBpNpPEPUTKrW+RIM8OSUzvmrAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAFgTPFlDaGv1rMB1ZJw6ZuNYWfAkWBnknqgp7gVFqCyhAkCAi9TxNf23Bxp6l9sVRzBKYoh5lBS14qeaivJ7A/47aOBRElo0oH3TO/3vW+lWRs+B0rVXvSYniGphXpGH9oFDx92/uqww7hTb3AuBAVqqTDfgj0HQWXoH3FKX9nBhFLeqXn1E0Zo4y2tdZKjkVIu1BVELApbmG/cuo6bnjOo20vs63j8XtEhhRoV+jVdJS8WtI/rZhxsXqBe4gzEdeahaj1HkRbLsv/6HRS1b74wvklpdZg/QaC7rup4tTCkDqW5ioeHL3eYwP0iuGkQtyxHLyX9IOuT1Lt+/TKSzC+4=</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/shibboleth-idp/AA"/>
-<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-</AttributeAuthorityDescriptor>
-<IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-169" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-<Extensions>
-<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">studera.nu</shibmeta:Scope>
-</Extensions>
-<KeyDescriptor use="signing">
-<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:X509Data>
-<ds:X509Certificate>MIIC/jCCAeagAwIBAgIJAMXBqFyzE+eyMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTA4MDExMTExMTg0NloXDTE4MDEwODExMTg0NlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDuOJy8znIq+12hFWckc2W4ghjWa8ltdyM850ty7pgetqFWg5lDO0GLRJSRne9eth0xowH4h9PcBa1Y+wKV71MiU5QHX+k3nyreN+HjxJ2vki0DD0fW5D3EdpXW/bHyQZ/R5v4dgGjevgsuGNJMB2ncJhVELIe/XJZotW86r973aYVnsadEy3XuYi6mvCm60OYk44H2IC2lx9wbmfA843ckSHTU75UvWKlfIAFFuMKZzP9XNIZVeHIvSxV3fNe1hrE82Otvz5t4avLbEXnsD/GWqnlYyaJ9IQksR240fLWs+3wB9IFRZ63BnFCwVDoBpNpPEPUTKrW+RIM8OSUzvmrAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAFgTPFlDaGv1rMB1ZJw6ZuNYWfAkWBnknqgp7gVFqCyhAkCAi9TxNf23Bxp6l9sVRzBKYoh5lBS14qeaivJ7A/47aOBRElo0oH3TO/3vW+lWRs+B0rVXvSYniGphXpGH9oFDx92/uqww7hTb3AuBAVqqTDfgj0HQWXoH3FKX9nBhFLeqXn1E0Zo4y2tdZKjkVIu1BVELApbmG/cuo6bnjOo20vs63j8XtEhhRoV+jVdJS8WtI/rZhxsXqBe4gzEdeahaj1HkRbLsv/6HRS1b74wvklpdZg/QaC7rup4tTCkDqW5ioeHL3eYwP0iuGkQtyxHLyX9IOuT1Lt+/TKSzC+4=</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
-<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testc.ladok.umu.se/shibboleth-idp/SSO"/>
-</IDPSSODescriptor>
-<Organization>
-<OrganizationName xml:lang="en">Studera.NU</OrganizationName>
-<OrganizationDisplayName xml:lang="en">Studera.NU</OrganizationDisplayName>
-<OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>
-</Organization>
-<ContactPerson contactType="technical">
-<Company>LADOK-enheten UMU</Company>
-<GivenName>Fredrik</GivenName>
-<SurName>?slund</SurName>
-<EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
-</ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-1.0/shibidp.uu.se.xml b/swamid-1.0/shibidp.uu.se.xml
index 39329d4b..2c56207e 100644
--- a/swamid-1.0/shibidp.uu.se.xml
+++ b/swamid-1.0/shibidp.uu.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.uu.se/identity">
- <AttributeAuthorityDescriptor ID="role-108" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">user.uu.se</shibmeta:Scope>
</Extensions>
@@ -14,7 +14,7 @@
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uu.se:8443/shibboleth-idp/AA"/>
<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
</AttributeAuthorityDescriptor>
- <IDPSSODescriptor WantAuthnRequestsSigned="false" ID="role-109" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">user.uu.se</shibmeta:Scope>
</Extensions>
@@ -31,12 +31,12 @@
</IDPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">UU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
- <Company>Uppsala universitet</Company>
- <SurName>IT Stöd</SurName>
+ <Company>Uppsala Universitet</Company>
+ <SurName>IT St?d</SurName>
<EmailAddress>shibboleth-datordrift@its.uu.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/sp.lhs.se.xml b/swamid-1.0/sp.lhs.se.xml
index 419ede4b..80925a6b 100644
--- a/swamid-1.0/sp.lhs.se.xml
+++ b/swamid-1.0/sp.lhs.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lhs.se/shibboleth">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-149" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -12,7 +12,7 @@
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">LHS</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Lärarhögskolan i Stockholm</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">L?rarh?gskolan</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.lhs.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-1.0/sp1.lab.it.su.se.xml b/swamid-1.0/sp1.lab.it.su.se.xml
index 335426ec..89683c8c 100644
--- a/swamid-1.0/sp1.lab.it.su.se.xml
+++ b/swamid-1.0/sp1.lab.it.su.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp1.lab.it.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-7" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/stt_metadata.xml b/swamid-1.0/stt_metadata.xml
deleted file mode 100644
index a708bee9..00000000
--- a/swamid-1.0/stt_metadata.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<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:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>downloads.channel8.msdn.com</ds:KeyName>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIEEDCCA3mgAwIBAgIQN06OsbviIojJc+SBPDreGzANBgkqhkiG9w0BAQUFADCB
- zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
- Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
- CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh
- d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl
- cnZlckB0aGF3dGUuY29tMB4XDTA3MTAwOTAwMDAwMFoXDTA4MTAwODIzNTk1OVow
- gZAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS
- ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xFDASBgNVBAsT
- C0NFUlRJRklDQVRFMSQwIgYDVQQDExtkb3dubG9hZHMuY2hhbm5lbDgubXNkbi5j
- b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfyRQMTqYbgXsPNT2q
- gSnbF8qIkt1jsZ3rrT3s8ILtoYGSH6LgC7ILO/+Zktr5gBt84CMVmDY/XJ0jsN8N
- OzlBTD4yhpiaKxSABxSvyAHHTuzFBnXiGiLd4Pcw86vtaoBZ6srUBlrTwuvjIBBC
- B/g7L/aOUWAHEXUgXdi/yHi4jLZe/37lH0Wpfz/49NiesaIPRCZ8hYwYGnbVFr1B
- StSFztsM5YQFH3XabRF5XzapD8Gct1PwFCnyNdRvo2OXCrPLlEEBB+Y6+tNOwKOt
- qWtFsaUnURQWh/lf7sSHa+XrbI/Kne3ygVuEi3N5fqJaSo5unMBBPrrXR0ZZNV04
- Xqm7AgMBAAGjgaYwgaMwDAYDVR0TAQH/BAIwADBABgNVHR8EOTA3MDWgM6Axhi9o
- dHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlU2VydmVyUHJlbWl1bUNBLmNybDAd
- BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYIKwYBBQUHAQEEJjAkMCIG
- CCsGAQUFBzABhhZodHRwOi8vb2NzcC50aGF3dGUuY29tMA0GCSqGSIb3DQEBBQUA
- A4GBALUFY4LBe1RA6yi+6jYgfqDP+8qnlVcTdYV9a9eJyrJvDZd8eMZqKuvAT9UX
- QeMSqbxZcgIn8GPEkCTX3HsuQChoZFadYsBWOha1je24YMZTSkouCE3W8yBR4XOF
- Es+bSTRT3KgVDqcKdr1Yf6FrxJzaVyKjMjWD3lNSYimR4opC
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
- Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/POST"/>
- <AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
- Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/Artifact"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">Student Tech Toolbox</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Student Tech Toolbox</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">https://downloads.channel8.msdn.com</OrganizationURL>
- </Organization>
- <ContactPerson contactType="support">
- <GivenName>STT Support</GivenName>
- <EmailAddress>mailto:stt@9starresearch.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="technical">
- <GivenName>STT Technical</GivenName>
- <EmailAddress>mailto:stt@9starresearch.com</EmailAddress>
- </ContactPerson>
- <ContactPerson contactType="administrative">
- <GivenName>Bruce</GivenName>
- <SurName>Curling</SurName>
- <EmailAddress>mailto:bcurling@microsoft.com</EmailAddress>
- </ContactPerson>
-</EntityDescriptor> \ No newline at end of file
diff --git a/swamid-1.0/sympa.lab.it.su.se.xml b/swamid-1.0/sympa.lab.it.su.se.xml
index aeb3c24e..c613fc9e 100644
--- a/swamid-1.0/sympa.lab.it.su.se.xml
+++ b/swamid-1.0/sympa.lab.it.su.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sympa.lab.it.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-105" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
diff --git a/swamid-1.0/toylan3.umdc.umu.se.xml b/swamid-1.0/toylan3.umdc.umu.se.xml
index e03a24bc..a1becac1 100644
--- a/swamid-1.0/toylan3.umdc.umu.se.xml
+++ b/swamid-1.0/toylan3.umdc.umu.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://toylan3.umdc.umu.se/shibboleth">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-83" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -12,7 +12,7 @@
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">UU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Ume? University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-1.0/tracks.it.su.se.xml b/swamid-1.0/tracks.it.su.se.xml
new file mode 100644
index 00000000..0bda73de
--- /dev/null
+++ b/swamid-1.0/tracks.it.su.se.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tracks.it.su.se/shibboleth">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIB3TCCAUagAwIBAgIJAKMNYLPEmQEHMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3RyYWNrcy5pdC5zdS5zZTAeFw0wODA4MDYwODU4MzVaFw0wOTA4MDYwODU4MzVaMBoxGDAWBgNVBAMTD3RyYWNrcy5pdC5zdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyp8tiALjvVcz8AtTw5lt8CljLmOnCReeZQtm2aGGsgA6mWW3Mf9B14/4EppJ2fpko2CcMihfpy/uiVQ70f8EBJtcH2ugzBpGymYp22taan2SFSmeeC5krk5cro9D9MTtoCWmRARyIqbPpn5beVE2gJDLaFyuDsiX1P2RXzNQTCcCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQCvxq/E3dnnlDsEAZMNTgg1qKgC9EvgCGTSCE/iOXLYLpDczN55HA2nlKG2h7QC/E2Pz0bOny/oVd9qVePgaoukYSSkhgcjz5GufkTHfuOjK9JlrK1cIxk9mZjZaLcYhK4mHf92hMhalIFwRBOvVGZLcbrXic2ceaJkptRV8xCYrw==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tracks.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">SU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>SU</Company>
+ <GivenName>Leif</GivenName>
+ <SurName>Johansson</SurName>
+ <EmailAddress>leifj@it.su.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/umdac-humpdac.ad.umu.se.xml b/swamid-1.0/umdac-humpdac.ad.umu.se.xml
index 045a2a69..8404a7b1 100644
--- a/swamid-1.0/umdac-humpdac.ad.umu.se.xml
+++ b/swamid-1.0/umdac-humpdac.ad.umu.se.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-humpdac.ad.umu.se/shibboleth">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-86" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -12,7 +12,7 @@
</SPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">UU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Ume? University</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-1.0/www.sub.su.se.xml b/swamid-1.0/www.sub.su.se.xml
index 31f4e2ee..0e75e656 100644
--- a/swamid-1.0/www.sub.su.se.xml
+++ b/swamid-1.0/www.sub.su.se.xml
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sub.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-112" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIB2TCCAUKgAwIBAgIJAImgxEcDBuYqMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNVBAMTDXd3dy5zdWIuc3Uuc2UwHhcNMDcwNTE1MTIzMDE4WhcNMDgwNTE0MTIzMDE4WjAYMRYwFAYDVQQDEw13d3cuc3ViLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbvijE2+sqD0NyBfWMZVsb0GgEn3IrxKzop1K2/6L33vviK3onWDmTqeV9+XgjCuOe2R5W5NecARSdFsuFjK+vhacMYSqDmLzTgg4zpEnqzHbXGElT0Ua/fvJh65yFCWh9VIzFJRSp3rZHw/re7heXh7ZJK9EOuQS/UJnS8Fpu9QIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBAGnfbiHzYvzbC+lC/ntDkWK77o2/3h3W2cpY9BeGAQEuYJ1/nwEdvNLX2Rx0N/0sd5BCCNOzquWhL72CjnXBVTQru25jw+KSRJRkZPz/bBpw9Zau+GDwxuAjQA6vysfiUOMhfQLLczpvvDR+MTm5UuI1NhiZQ1XR9ee5mmfvcfWA</ds:X509Certificate>
+ <ds:X509Certificate>MIIB2TCCAUKgAwIBAgIJAIRfFzH12j9JMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNVBAMTDXd3dy5zdWIuc3Uuc2UwHhcNMDgwNTE0MTQ0NzQ5WhcNMDkwNTE0MTQ0NzQ5WjAYMRYwFAYDVQQDEw13d3cuc3ViLnN1LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/9u6s9iHrmj7IvMgSpT8UEzo+Wld9S1QKximd7S6vkIf2arFtvC+Wr04ilfgS6Sp4fOXtGoo9nM7rp6CCdg2RNsrrPUrbs/QkLS5kii2lvQgJ+Q+cJNyJBJhUOgczKcF1nax1roIHKoRMrlRaaeYPv2hh4cVWT23gE5sd+L4pgwIDAQABoyswKTAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEBBQUAA4GBABcE9tkmR3jTnoWrU5o54zbUKsehvKJozqBrMInvLqwyURkUG2M2jHG+RLtJ0VXBYqtEPbjq0O0kQ6JjAlciMsgv9SVyYryhMjtHZujTalMnRwLF7uWNtR62wY+w53G+7dr9F6cOh4bCXqEN/xs8SoYEymgUBrfKR8SVNxRihZFk</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
diff --git a/swamid-1.0/www.wisum.umdac.umu.se.xml b/swamid-1.0/www.wisum.umdac.umu.se.xml
new file mode 100644
index 00000000..1b10c371
--- /dev/null
+++ b/swamid-1.0/www.wisum.umdac.umu.se.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.wisum.umdac.umu.se/shibboleth">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEIDCCAwigAwIBAgIJAK9QqKCZ3zkPMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MQ4wDAYDVQQLEwVVTURBQzEgMB4GA1UEAxMXc2hpYi53aXN1bS51bWRhYy51bXUuc2UwHhcNMDgwNDA5MTMxODExWhcNMTgwNDA3MTMxODExWjBaMQswCQYDVQQGEwJTRTEZMBcGA1UEChMQVW1lYSB1bml2ZXJzaXRldDEOMAwGA1UECxMFVU1EQUMxIDAeBgNVBAMTF3NoaWIud2lzdW0udW1kYWMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNj6WbsLMYpYHT4ADVRHbwuAQyFcOae7XyGOi8zBBBr72UP3xK6u1Hp3bt1yLRvt/RbHgCDpOzMmgMaRQ2cdl9Zvv5g/b+linOvMIYGQMPpyfLv2+bUcMVGRJdNLLEIMoLAXPBLxDxe6sFYYZXneJ23N/HcYLqlqAq6tcrRcYSqlg0MtgHb73X9pIGDOVkj4+kXRi8QgctJ6fP4smdjJ/czrit2pxpZVS/YPpd7+7HcNWW+KVBE21n0GiXB3+Xz/UlGDtJVK85xRLEeW968IshsIr2vb5owSw6bmCstJpfFAUnxUkFbSacPRZ6IE5RVwZsIDdU1x5fZWnZ7Go028vwIDAQABo4HoMIHlMB0GA1UdDgQWBBSKDBHqWWDKe3RRfwtFEKDYMT2QkjCBjAYDVR0jBIGEMIGBgBSKDBHqWWDKe3RRfwtFEKDYMT2QkqFepFwwWjELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDjAMBgNVBAsTBVVNREFDMSAwHgYDVQQDExdzaGliLndpc3VtLnVtZGFjLnVtdS5zZYIJAK9QqKCZ3zkPMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOCAQEADPd7MbU1LuZE1a109E/Aur9gr/A0OI6j4r5ODOlumR7XYKLvzjc8ccTh9//uznSGgxKsfB47YDRi1fNI+LemRfiLXaFex3gTPj0S8bXZtZHnotF9M97HgwXSihEfULhRqWZ/JYw4P96XX22BmAHCfAI6w6ZCxhDcY4ekDuOTKszPd9mdHw798GKqM0S+GRCtk4L0dQfeocWyEYaYI0bXNeJi7MNfmm5Qj9ynruEYKpOQfZ/oTeVmdhxe4T0CgOvygcsMPdYgTMrTItqtwO3vVRTn4ryNQLWtxs7sMF9v93ylUECtDyYoziBoL0qkD/aq7B+Wm9EV7D03jOf47P/LjQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wisum.umdac.umu.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">UU</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Ume? University</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>UMDAC</Company>
+ <GivenName>Tommy</GivenName>
+ <SurName>Larsson</SurName>
+ <EmailAddress>tommy.larsson@umdac.umu.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/www2.genuinetext.com.xml b/swamid-1.0/www2.genuinetext.com.xml
index 42887020..1f73d509 100644
--- a/swamid-1.0/www2.genuinetext.com.xml
+++ b/swamid-1.0/www2.genuinetext.com.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.genuinetext.com">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-80" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
@@ -18,7 +18,7 @@
<ContactPerson contactType="technical">
<Company>Know Net AB</Company>
<GivenName>Ingemar</GivenName>
- <SurName>Lundström</SurName>
+ <SurName>Lundstr?m</SurName>
<EmailAddress>ingemar.lundstrom@knownet.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-1.0/www3.genuinetext.com.xml b/swamid-1.0/www3.genuinetext.com.xml
new file mode 100644
index 00000000..7df036cb
--- /dev/null
+++ b/swamid-1.0/www3.genuinetext.com.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.genuinetext.com/shibboleth">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIB5zCCAVCgAwIBAgIJALLUhMva/oz0MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNVBAMTFHd3dzMuZ2VudWluZXRleHQuY29tMB4XDTA4MDUwNTEwNDkyNloXDTA5MDUwNTEwNDkyNlowHzEdMBsGA1UEAxMUd3d3My5nZW51aW5ldGV4dC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSCzocotpl6yxJCA6Jy7LwbatFjJ1UQ94ZcLJ36OPNlyX3rtLKPJTRwaCS+ld+Z7MXEWfrtEXt6iHhrNuj94HNr8dpPeneqZ7jmSI7yE22x4Xt/zvJLHdvrZypxCUs+mCWGigPchih9OgvDcTPS8Vh5GWq22yWfI7v18oWg+CR3AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADgYEAf8JbtDVoRymE0vdpbTlbjwsYK6CoXW3wi6/kb4ky6eqmGbz29niEa5xwoZKD8zDj/MNRMbVewLYqaYKanp9t/NnWY34wsiWGsszX88X91FXjjtVdVm5XaYl62RQvd6Z4OjffC0WdRzYMmqQcHQ3G5guQPQC5OaTB/2DkxLht4sg=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.genuinetext.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+ </SPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">Genuine Text</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Genuine Text</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.genuinetext.com</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <Company>Knownet AB</Company>
+ <GivenName>Richard</GivenName>
+ <SurName>B?ckman</SurName>
+ <EmailAddress>rickard@knonet.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/xfire.mimas.ac.uk.xml b/swamid-1.0/xfire.mimas.ac.uk.xml
index 10f7046a..b4e7835c 100644
--- a/swamid-1.0/xfire.mimas.ac.uk.xml
+++ b/swamid-1.0/xfire.mimas.ac.uk.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xfire.mimas.ac.uk/shibboleth">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" ID="role-144" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
<KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 13:33:33 +0000