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

Conflicts:
	swamid-sp-2.0.mxml

6 files changed, 189 insertions, 1 deletions

diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index f8defe10..33ef79b1 100644
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
@@ -12,7 +12,7 @@
         <mdui:Logo height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer&amp;docid=302</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
         <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml b/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
new file mode 100644
index 00000000..3514a1b7
--- /dev/null
+++ b/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://lu.exigus.com/simplesaml/module.php/saml/sp/metadata.php/lu">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Lunds universitets bildbank</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lund University's image bank</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Exigus, bildbank för Lunds universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Exigus, image bank for Lund University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9DCCAtygAwIBAgIJAKhSRFvQgg44MA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbTAeFw0xMzEwMDQwODA4MzNaFw0yMzEwMDQwODA4MzNaMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCrbgFGMTOe5zn4gDyxI+wwkl6kPaC6BcIS9nn7S2S3VrYzo2aSzTvwfU5vg5giqyGochzqmbP6OOI2rKDSbK8+pDB5cLc6SgNgVO1m8fHnYkmxGlVyiRlZem34ar7fiFKXY/zrxQOdOvPI/4dV9xQRahhCHrZLOh8fWk6oPjmbGO0ml0JTHpPoYIFP7D/akY/KnIlsB42kNOLk8sNQOMUQYmBNTVrKG0Aqptebo2IWcYUEioZ8YKJQmDOUzaidzKuvkidpDKAUCyT+mmqwXgf+GYSZkNz9yrQHEzl843EVf11xExqHgFHnsGdrfq0vtKK/kTmjR+QCSUdBotPSlM8CAwEAAaOBvjCBuzAdBgNVHQ4EFgQUTPLmY2W1VZlDn7UGoVt/wVbzkIYwgYsGA1UdIwSBgzCBgIAUTPLmY2W1VZlDn7UGoVt/wVbzkIahXaRbMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbYIJAKhSRFvQgg44MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEOZfA+vz6VvQiBAF+0kLEXhoxye4MiOEaXBvvPnYAo5tFwnzCUpAMi+iFnnTXkbO6HKo3801CVCAoihD7V8biik8rPgLUe9/dU44F/UxBTa7386tXJSHLOZvTCiliuBljMk7Ysk041+z8+QkixJbe3lZiXwJhbuiPxYqgORWNPA6P4zQ/yn9G0elmsCazX01YUYiCHogAYROpRPG39IbtK0/kVh0RhDzpftO5Bsr3lY+1EK5HSgA9LV+YtLt9tQSnzm/2YjfFF1/mtraOD+fXEiRzgvRgZMVgpDrzFQ7S5V0mt1DwSJqnwDPzzI20qyyuEiwHwtcneW5+53XvKzlyw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9DCCAtygAwIBAgIJAKhSRFvQgg44MA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbTAeFw0xMzEwMDQwODA4MzNaFw0yMzEwMDQwODA4MzNaMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCrbgFGMTOe5zn4gDyxI+wwkl6kPaC6BcIS9nn7S2S3VrYzo2aSzTvwfU5vg5giqyGochzqmbP6OOI2rKDSbK8+pDB5cLc6SgNgVO1m8fHnYkmxGlVyiRlZem34ar7fiFKXY/zrxQOdOvPI/4dV9xQRahhCHrZLOh8fWk6oPjmbGO0ml0JTHpPoYIFP7D/akY/KnIlsB42kNOLk8sNQOMUQYmBNTVrKG0Aqptebo2IWcYUEioZ8YKJQmDOUzaidzKuvkidpDKAUCyT+mmqwXgf+GYSZkNz9yrQHEzl843EVf11xExqHgFHnsGdrfq0vtKK/kTmjR+QCSUdBotPSlM8CAwEAAaOBvjCBuzAdBgNVHQ4EFgQUTPLmY2W1VZlDn7UGoVt/wVbzkIYwgYsGA1UdIwSBgzCBgIAUTPLmY2W1VZlDn7UGoVt/wVbzkIahXaRbMFkxCzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlFeGlndXMgQUIxEzARBgNVBAMTCmV4aWd1cy5jb20xITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAZXhpZ3VzLmNvbYIJAKhSRFvQgg44MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEOZfA+vz6VvQiBAF+0kLEXhoxye4MiOEaXBvvPnYAo5tFwnzCUpAMi+iFnnTXkbO6HKo3801CVCAoihD7V8biik8rPgLUe9/dU44F/UxBTa7386tXJSHLOZvTCiliuBljMk7Ysk041+z8+QkixJbe3lZiXwJhbuiPxYqgORWNPA6P4zQ/yn9G0elmsCazX01YUYiCHogAYROpRPG39IbtK0/kVh0RhDzpftO5Bsr3lY+1EK5HSgA9LV+YtLt9tQSnzm/2YjfFF1/mtraOD+fXEiRzgvRgZMVgpDrzFQ7S5V0mt1DwSJqnwDPzzI20qyyuEiwHwtcneW5+53XvKzlyw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml2-logout.php/lu"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml2-acs.php/lu" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml1-acs.php/lu" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml2-acs.php/lu" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml1-acs.php/lu/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pontus</md:GivenName>
+    <md:SurName>Uggla</md:SurName>
+    <md:EmailAddress>pontus@exigus.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/play.smdb.kb.se.xml b/swamid-2.0/play.smdb.kb.se.xml
new file mode 100644
index 00000000..c1b2fd10
--- /dev/null
+++ b/swamid-2.0/play.smdb.kb.se.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://play.smdb.kb.se">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket play</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">National Library of Sweden play</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är KBs play tjänst</mdui:Description>
+        <mdui:Description xml:lang="en">This is the National Library of Sweden's streaming service</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.smdb.kb.se/user/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.smdb.kb.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SMDB Play</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SMDB Play</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.smdb.kb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..267c55d3
--- /dev/null
+++ b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uuc-web003-t.its.uu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
+        <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uuc-web003-t.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uuc-web003-t.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAPhRlksDW0wSMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFnV1Yy13ZWIwMDMtdC5pdHMudXUuc2UwHhcNMTUwOTE4MDY1OTQxWhcNMjUw
+OTE1MDY1OTQxWjAhMR8wHQYDVQQDExZ1dWMtd2ViMDAzLXQuaXRzLnV1LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwU9rAqXKlhaLFM7oPibppQdP
+R8hEQ+Zi1usBQAtohAzbgL0R276j/BMci53l4fa9P6jF5aaXlU9PLs0cUURvRopR
+LlDkC84dXkZLbFPTD+/quEHDeOML0sZWw6VtzL4kl652k97SAoqNx7zbV335alvA
+1ACt+YtrbT8ym8e7YGOhBin+Y5WqYs1b/D5yh38k1bQGAVY7bqtOK7Y3XdEvkDYh
+vWHgFL7khc+QEw3d72S9wPNnfX+FgZMXuz1okS72DEcjjb77M1UIGiyagg247Wwa
+4H73gVcrTpwnDAh+DiUwhbaYyH9+ViSFmNThqWkqIOZXvt+/y2Rp8eWbL12MKQID
+AQABo0QwQjAhBgNVHREEGjAYghZ1dWMtd2ViMDAzLXQuaXRzLnV1LnNlMB0GA1Ud
+DgQWBBSdM1k91L9QvI6lJC+Oh3HQLvGDgjANBgkqhkiG9w0BAQUFAAOCAQEACcvQ
+CJFk2w4WW9D2JU3dxlq09aE4v+73YOWd4TlBtkAuyrGpwMPTiBYA8OU+DE8EcdKM
+7l+VtpHA48Z9ZyvhzJPF5pvaZ36m+l0uFPFGKdojlcoq19vZWqWnSLgYV09ZUQr6
+z01JVIohVtzQJdDqTa46iX1SH7Ua18WlMa5EzKZxi/rRUUFC/V2Y4DjiOWNLjJjJ
+umZywxXDdeFDXklzUJ03xK1ZZumz6j2RlWUMI2591YFq71lXQPaWT740Vq7s5HEY
+6vZkQRWAVo37ivk8rfah2ktZre0hz/991kH2iaKtdkLUxh1oF1f6OoXIOWglFCMK
+R+DVLFswqfvJvRRyTA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7703e66c..28ae4b1d 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -460,4 +460,6 @@
   <xi:include href="swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/play.hkr.se.xml"/>
   <xi:include href="swamid-2.0/saml.salesforce.com-sunet-sandbox.xml"/>
+  <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
+  <xi:include href="swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 6cd94f4a..1f350139 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -61,4 +61,5 @@
   <xi:include href="swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test.bils.se-auth-metadata.xml"/>
   <xi:include href="swamid-2.0/meta-test.eduroam.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml"/>
 </EntitiesDescriptor>