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

11 files changed, 434 insertions, 26 deletions

diff --git a/swamid-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..6789982c
--- /dev/null
+++ b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.lu.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
+MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
+f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
+9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
+QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
+o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
+ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
+ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
+JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
+CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
+g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
+jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
+u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
+MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
+f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
+9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
+QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
+o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
+ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
+ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
+JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
+CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
+g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
+jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
+u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
new file mode 100644
index 00000000..9a461ab0
--- /dev/null
+++ b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.sics.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">sics.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SICS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SICS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for SICS</mdui:Description>
+        <mdui:Description xml:lang="sv">Identity Provider för SICS</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sics.se</mdui:InformationURL>
+        <mdui:Logo height="95" width="328">https://www.sics.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>sics.se</mdui:DomainHint>
+        <mdui:DomainHint>tii.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.64.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.135.0/24</mdui:IPHint>
+        <mdui:IPHint>192.71.100.0/25</mdui:IPHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFKzCCBBOgAwIBAgIQDFPDqRLGthue9PVUlHMf7DANBgkqhkiG9w0BAQUFADBm
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBDQS0zMB4XDTEzMDExMDAwMDAwMFoXDTE2MDMxNTEyMDAwMFowaDELMAkGA1UE
+BhMCU0UxFzAVBgNVBAgTDlN0b2NraG9sbXMgTGFuMQ4wDAYDVQQHEwVLaXN0YTEc
+MBoGA1UEChMTU0lDUyBTd2VkaXNoIElDVCBBQjESMBAGA1UEAwwJKi5zaWNzLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbJY78glP+QcpN/1pTDl
+x658C3OYBSAKMDPy9CeHcFtvhoGa+s+vS49L4a2LPPqQkEJINRI+OhFUeLu034dA
+9TKZ6ptsOEJkjYjJ+BcCkCw/zi0crOJWgXWWc+Rdqg9nasHWMFO0Js67JnACv2OJ
+mrnj3BBN5hMaeOTu7YTs4T7qwz5LSpttenGUicLiot2m/ZekEgCHYgLaPhNV3waX
+5WYkUlQIWCR7PFlrZDxedmS4R6NGeQdtihcM2IvzlfB2MajrGf/+62jEoYqZrcb8
+zYEDuFJjQl/BM2Os6HelcRZxi+OD+ZOHDsM1C9taeG7wQp0opvNdZQrf4DO53reY
+TQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cw
+HQYDVR0OBBYEFBJBAFefeNXl1kFec1rnaA62ttNhMCoGA1UdEQQjMCGCCSouc2lj
+cy5zZYIHc2ljcy5zZYILaWRwLnNpY3Muc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRw
+Oi8vY3JsMy5kaWdpY2VydC5jb20vY2EzLWcyOC5jcmwwKqAooCaGJGh0dHA6Ly9j
+cmw0LmRpZ2ljZXJ0LmNvbS9jYTMtZzI4LmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG
+/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl
+cnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v
+RGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkq
+hkiG9w0BAQUFAAOCAQEAPwtD1Bv5RBu9+KMT/JyVrTrAH66jS1pFqDHQAYoFDvdV
+ebxTYVH/HQjRhKlykH+EUGpfYXWOhzlI0mqhCkfcqZK2CFxOf+lWxQ2V5vBFM8kF
+lhRU+z3mEG8SvZ4tmybjutbmBhjcOo22cqpNsqL0hIOqt+zoxMI/nZTeClQj3SlT
+/bgk9BXnvISi5P+zHMXuVYFmzWeKlr8oKFbIzAPTaJkm0c40+zBar/siKNOmHgio
+XnX1bzCBFJxjpRM6ZDPIos7p3UMsWRKu5BJndINmR5oxYVMOxX+BV3zR04p4WR1N
+SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sics.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol                                                             urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">sics.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFKzCCBBOgAwIBAgIQDFPDqRLGthue9PVUlHMf7DANBgkqhkiG9w0BAQUFADBm
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBDQS0zMB4XDTEzMDExMDAwMDAwMFoXDTE2MDMxNTEyMDAwMFowaDELMAkGA1UE
+BhMCU0UxFzAVBgNVBAgTDlN0b2NraG9sbXMgTGFuMQ4wDAYDVQQHEwVLaXN0YTEc
+MBoGA1UEChMTU0lDUyBTd2VkaXNoIElDVCBBQjESMBAGA1UEAwwJKi5zaWNzLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbJY78glP+QcpN/1pTDl
+x658C3OYBSAKMDPy9CeHcFtvhoGa+s+vS49L4a2LPPqQkEJINRI+OhFUeLu034dA
+9TKZ6ptsOEJkjYjJ+BcCkCw/zi0crOJWgXWWc+Rdqg9nasHWMFO0Js67JnACv2OJ
+mrnj3BBN5hMaeOTu7YTs4T7qwz5LSpttenGUicLiot2m/ZekEgCHYgLaPhNV3waX
+5WYkUlQIWCR7PFlrZDxedmS4R6NGeQdtihcM2IvzlfB2MajrGf/+62jEoYqZrcb8
+zYEDuFJjQl/BM2Os6HelcRZxi+OD+ZOHDsM1C9taeG7wQp0opvNdZQrf4DO53reY
+TQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cw
+HQYDVR0OBBYEFBJBAFefeNXl1kFec1rnaA62ttNhMCoGA1UdEQQjMCGCCSouc2lj
+cy5zZYIHc2ljcy5zZYILaWRwLnNpY3Muc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRw
+Oi8vY3JsMy5kaWdpY2VydC5jb20vY2EzLWcyOC5jcmwwKqAooCaGJGh0dHA6Ly9j
+cmw0LmRpZ2ljZXJ0LmNvbS9jYTMtZzI4LmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG
+/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl
+cnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v
+RGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkq
+hkiG9w0BAQUFAAOCAQEAPwtD1Bv5RBu9+KMT/JyVrTrAH66jS1pFqDHQAYoFDvdV
+ebxTYVH/HQjRhKlykH+EUGpfYXWOhzlI0mqhCkfcqZK2CFxOf+lWxQ2V5vBFM8kF
+lhRU+z3mEG8SvZ4tmybjutbmBhjcOo22cqpNsqL0hIOqt+zoxMI/nZTeClQj3SlT
+/bgk9BXnvISi5P+zHMXuVYFmzWeKlr8oKFbIzAPTaJkm0c40+zBar/siKNOmHgio
+XnX1bzCBFJxjpRM6ZDPIos7p3UMsWRKu5BJndINmR5oxYVMOxX+BV3zR04p4WR1N
+SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/its-pd0328.ad.umu.se-shibboleth.xml b/swamid-2.0/its-pd0328.ad.umu.se-shibboleth.xml
index cce33272..758242d4 100644
--- a/swamid-2.0/its-pd0328.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/its-pd0328.ad.umu.se-shibboleth.xml
@@ -27,14 +27,15 @@
   </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="http://its-pd0328.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <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="http://its-pd0328.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/HH"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SU"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/MIUN"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/KTH"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/UMU"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/ADFSTEST"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/MIUN"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/KTH"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/SU"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/UMU"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/ADFSTEST"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/HH"/>
+      <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://its-pd0328.ad.umu.se/Shibboleth.sso/HHTEST"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">ITS, Umeå universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">ITS, Umea University</mdui:DisplayName>
@@ -82,19 +83,19 @@ RA==
       <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="http://its-pd0328.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://its-pd0328.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://its-pd0328.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/registry.swamid.se-saml2-metadata.xml b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
new file mode 100644
index 00000000..9c084794
--- /dev/null
+++ b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registry.swamid.se/saml2/metadata/">
+  <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 AuthnRequestsSigned="false" WantAssertionsSigned="true" 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">SWAMID PEER</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SWAMID PEER</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">SWAMID metadata registry</mdui:Description>
+        <mdui:Description xml:lang="en">SWAMID metadata registry</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJALBwBoyJSdS3MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMMEnJlZ2lzdHJ5LnN3YW1pZC5zZTAeFw0xNDA5MjkxMzQ2MTZaFw0yNDA5MjYx
+MzQ2MTZaMB0xGzAZBgNVBAMMEnJlZ2lzdHJ5LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALAmfWTwfXf3O85urmVux9wO0zgrIBWzUEEb
+gGNN0yKgYjvYR4w69b3olXKKTjCaJsCHksc7belAl3pqVShGdKmmDSN/E6+jl5ul
+GSYwFx52AlaMEMoPv7slVZbN1kcoPvaJ5t93vcM17JDaa8bROPb63MbCMcmAMgUm
+ZmSZrv1fu1cq08XVMHTQJ5BW7NmW7PaA+tbRckLI764L8Tv9aqewi3aRRp3OO2eX
+lGu/6tz6MhOGv8gdY5Y3XKuGanJQmt+FgTkcEKvlTvk7tYActi8SY6PiLXlMfoJF
+bSGSu1irUT/hC7x9kSCOPYH3vXJx+Z0PS3cRcYlyHi6/W/qqQJkCAwEAAaNQME4w
+HQYDVR0OBBYEFF3t1ekJ/iTlxpQSy9uKYOxAW8GsMB8GA1UdIwQYMBaAFF3t1ekJ
+/iTlxpQSy9uKYOxAW8GsMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+ACWRN5N5AfJSehnb6io22WftigC/HtY+yr2iaFtZfJXoLwtTHxffK7SKC84Ac6bu
+rovh0FUgfj4QWgQ06IL906ENaqEWNDRzUI9xWe+RCNEFVWvKyU5jh9j6JGG8JUYh
+Y84CiK5LlMi9XtAmNhClbOUP//3a5UHARhNmFcRxxiwfRY2k0sMNmhlk31xh+gwb
+CuQ36pkExudxFaHv+Vjv09LXtJxRnfvffGXFlT/DUeddhqC2vKtVoIg8S8295rOk
+jkl44jhVvXLSythVxryo/Mf7b8QbicsObxpxFMb9ifVbWyi5ri0WLgvQAXpyw/MH
+3lQIb3o7ibN/Oix1Wq0WXuA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://registry.swamid.se/saml2/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry.swamid.se/saml2/acs/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">PEER SP</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="se">SWAMID</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="se">SWAMID</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SWAMID</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="se">http://www.swamid.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SWAMID</md:Company>
+    <md:GivenName>Anders</md:GivenName>
+    <md:SurName>Lordal</md:SurName>
+    <md:EmailAddress>anders.lordal@hig.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>SWAMID</md:Company>
+    <md:GivenName>Anders</md:GivenName>
+    <md:SurName>Lordal</md:SurName>
+    <md:EmailAddress>anders.lordal@hig.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
index 9e766694..b09c823d 100644
--- a/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml
@@ -12,8 +12,8 @@
         <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="78" width="382">http://www.lu.se/profiles/lu/themes/lu_theme/logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="90" width="450">http://www2.ldc.lu.se/images/LU_eng_logo.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">lu lth lunds+tekniska+högskola lunds+tekniska+hogskola</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lu lth lunds+tekniska+högskola lunds+tekniska+hogskola</mdui:Keywords>
+        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>lu.se</mdui:DomainHint>
diff --git a/swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..5edb8a50
--- /dev/null
+++ b/swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,46 @@
+<?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://tucana.sai.kau.se/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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">Logga in på kau.se(utv)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Login to kau.se(dev)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Utv. plats för externwebb.</mdui:Description>
+        <mdui:Description xml:lang="en">Dev for external webb.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEFTCCAv2gAwIBAgIJAN9H95T2Z0Z5MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJzZTERMA8GA1UECAwIdmFybWxhbmQxETAPBgNVBAcMCGthcmxzdGFkMRwwGgYDVQQKDBNrYXJsc3RhZCB1bml2ZXJzaXR5MRYwFAYDVQQLDA1pdGF2ZGVsbmluZ2VuMRowGAYDVQQDDBF0dWNhbmEuc2FpLmthdS5zZTEZMBcGCSqGSIb3DQEJARYKdWdoQGthdS5zZTAeFw0xNDA5MTgwODU4NDZaFw0yNDA5MTcwODU4NDZaMIGgMQswCQYDVQQGEwJzZTERMA8GA1UECAwIdmFybWxhbmQxETAPBgNVBAcMCGthcmxzdGFkMRwwGgYDVQQKDBNrYXJsc3RhZCB1bml2ZXJzaXR5MRYwFAYDVQQLDA1pdGF2ZGVsbmluZ2VuMRowGAYDVQQDDBF0dWNhbmEuc2FpLmthdS5zZTEZMBcGCSqGSIb3DQEJARYKdWdoQGthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKfgmMmeqME3GZcWMAngHbf6FFxhbhuiRBT/6a7IPpcWr7rwJAuVXIiAdX5sxMKjYz5djm+dVHt6zudxZ7vVgD641WjPjw9h0FdVeTz8HdI5vR9IJEsD+GKqvMBD1+HyQ8vW+Xr0TcP5rxj/G+1/wv5S1UgdLoRUSAdQp2Mvd2r2kJixRpQUV10cN2lWmGOk+k4uLNl9k6TXmocHWf81DxjxcvMmEB0yoCQPkuXVyQA6FGJqhT9KJWg0SNw+NFxfGHeBhlPUDvUxqcBm69eXEbBwgRnlGAxwGCFcrZ7+VkDj5knfJGdQbUjkTu3kb8ZsRwerscem5z7rxFqALHZ0PuECAwEAAaNQME4wHQYDVR0OBBYEFIbpD3gJSmtO+vtiVj9e6daa38KVMB8GA1UdIwQYMBaAFIbpD3gJSmtO+vtiVj9e6daa38KVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAPbs5yhA94DVpfeS8bhD08z+6VDgi+wKzjRXvwN8eFnKJNCClvoZIF8r242dWEN2DnjjuOqWVWqgpRwrPhed0dUJiVvbzlpQGTgPgVOKQb2rDZIhzHlPI8eP4DYg8qIAZ7fd6ONEuwd+0fAiK15nYcPfO0Ce5hWvnIKWNSbc6HX+LUPBA4UtqERXiItDUVyPg9f9PuJUomug6dVF3orj1fqOkqZ2rYVDh9xw6qMCvlX65YRkSALnZfs5DcdP3IfaFahngoLIrvqtaE0JLrd7ozVSNGPRutrnVzfC7xxADU0Vr/J04f+79kcPfpuWyoyPk8vpaGYtha0fzN5HerLSPM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEFTCCAv2gAwIBAgIJAN9H95T2Z0Z5MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJzZTERMA8GA1UECAwIdmFybWxhbmQxETAPBgNVBAcMCGthcmxzdGFkMRwwGgYDVQQKDBNrYXJsc3RhZCB1bml2ZXJzaXR5MRYwFAYDVQQLDA1pdGF2ZGVsbmluZ2VuMRowGAYDVQQDDBF0dWNhbmEuc2FpLmthdS5zZTEZMBcGCSqGSIb3DQEJARYKdWdoQGthdS5zZTAeFw0xNDA5MTgwODU4NDZaFw0yNDA5MTcwODU4NDZaMIGgMQswCQYDVQQGEwJzZTERMA8GA1UECAwIdmFybWxhbmQxETAPBgNVBAcMCGthcmxzdGFkMRwwGgYDVQQKDBNrYXJsc3RhZCB1bml2ZXJzaXR5MRYwFAYDVQQLDA1pdGF2ZGVsbmluZ2VuMRowGAYDVQQDDBF0dWNhbmEuc2FpLmthdS5zZTEZMBcGCSqGSIb3DQEJARYKdWdoQGthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKfgmMmeqME3GZcWMAngHbf6FFxhbhuiRBT/6a7IPpcWr7rwJAuVXIiAdX5sxMKjYz5djm+dVHt6zudxZ7vVgD641WjPjw9h0FdVeTz8HdI5vR9IJEsD+GKqvMBD1+HyQ8vW+Xr0TcP5rxj/G+1/wv5S1UgdLoRUSAdQp2Mvd2r2kJixRpQUV10cN2lWmGOk+k4uLNl9k6TXmocHWf81DxjxcvMmEB0yoCQPkuXVyQA6FGJqhT9KJWg0SNw+NFxfGHeBhlPUDvUxqcBm69eXEbBwgRnlGAxwGCFcrZ7+VkDj5knfJGdQbUjkTu3kb8ZsRwerscem5z7rxFqALHZ0PuECAwEAAaNQME4wHQYDVR0OBBYEFIbpD3gJSmtO+vtiVj9e6daa38KVMB8GA1UdIwQYMBaAFIbpD3gJSmtO+vtiVj9e6daa38KVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAPbs5yhA94DVpfeS8bhD08z+6VDgi+wKzjRXvwN8eFnKJNCClvoZIF8r242dWEN2DnjjuOqWVWqgpRwrPhed0dUJiVvbzlpQGTgPgVOKQb2rDZIhzHlPI8eP4DYg8qIAZ7fd6ONEuwd+0fAiK15nYcPfO0Ce5hWvnIKWNSbc6HX+LUPBA4UtqERXiItDUVyPg9f9PuJUomug6dVF3orj1fqOkqZ2rYVDh9xw6qMCvlX65YRkSALnZfs5DcdP3IfaFahngoLIrvqtaE0JLrd7ozVSNGPRutrnVzfC7xxADU0Vr/J04f+79kcPfpuWyoyPk8vpaGYtha0fzN5HerLSPM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tucana.sai.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tucana.sai.kau.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tucana.sai.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tucana.sai.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tucana.sai.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tucana.sai.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sysapp</md:GivenName>
+    <md:EmailAddress>ugh@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 439e262a..8bfba979 100644
--- a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -10,8 +10,8 @@
         <mdui:Description xml:lang="en">Mid Sweden University Identity Provider, used by employees and students at Mid Sweden University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="78" width="163">http://www.miun.se/ImageVaultFiles/id_1159/cf_8/st_edited/Ja6nj94q_hdlyUdjZ6u0.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="78" width="163">http://www.miun.se/ImageVaultFiles/id_1159/cf_8/st_edited/Ja6nj94q_hdlyUdjZ6u0.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">http://www.miun.se/sv/Helpdesk/Student/MittNets-regler/</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
         <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
diff --git a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml b/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..5425cbd4
--- /dev/null
+++ b/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tentaadmindev.uhr.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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://www.tentaadmindev.uhr.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TentaAdmin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TentaAdmin</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Administration av tentamen och tentamensvakter.</mdui:Description>
+        <mdui:Description xml:lang="en">Administration av tentamen och tentamensvakter.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uhrextwebtest01.i.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhrextwebtest01.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAN6k6XIcpXI3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHVocmV4dHdlYnRlc3QwMS5pLnVoci5zZTAeFw0xNDA5MTUxMTM1NTFaFw0y
+NDA5MTIxMTM1NTFaMCMxITAfBgNVBAMTGHVocmV4dHdlYnRlc3QwMS5pLnVoci5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMs4QlMhfYX8rSvesdpb
+12C82iJMsUIi4d5omOwxmt7HNA6Xxz3HEW/ge3WmsjpHL1tN1gWQkILLOKyAUAPw
+R1xEEREQiNeFnrdcqpfMmSJudgumoocHLwNiU6Tcooi0aQGDkobvnX2r9oUbd2T5
+A/qXmwk1czLeHD0HAC+gD4Nsmjto0AvuxGHKlceSZStXAhdsdHpCKUEzReHPHkyO
+n4uE3fmDg2jnVeZQNbkRoWTZN216YBGaBYux0FDD9fnJA/X/8qPOPAwDptcNQj5u
+SS4zppajv2BaAHe3/IxXoCb3WEDE2i20N7FJ6pqiqfZbE8C8QwCrE+Ylj2m7UVLx
+vmUCAwEAAaNGMEQwIwYDVR0RBBwwGoIYdWhyZXh0d2VidGVzdDAxLmkudWhyLnNl
+MB0GA1UdDgQWBBQGJCUBefBDuYDpYQgWYVA1RaJo+TANBgkqhkiG9w0BAQUFAAOC
+AQEAfqYGfsx2YapLPbtavNH9c5BMK+uvx2Z52nJbje9/RdTigmDtPbW+ZSOibMpD
+EC7BlH7OMRM5j0/vVlRoRadjkJmRaEf/VfaNxwktgNQPVkXQatycSZ7oderQngbG
+CVlWHY4+3c6XmbuQZDjPYFQcbamkQf61/0xyPAXr6z7vF1RiSzt4ej9q3gI+7/if
+nQjC6dzNCzYmZcO1m5jx5BgECpee+1YzPgWSnZmXexQiPsv7AeTosT0CxdFkwKz9
+OCAgWY6O9B3McR43joEl1kbkE4ckdvrpmDrGdjZn78smL6SGV2Frl5d0ALjQSVkB
+9qq7wBTjnxf2rBXhnRNuEzB+Jw==
+</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://www.tentaadmindev.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 4b510eb2..47d48b71 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -54,4 +54,5 @@
   <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml"/>
+  <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ba99856b..5267be3c 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -313,4 +313,7 @@
   <xi:include href="swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml"/>
   <xi:include href="swamid-2.0/prisma.research.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+  <xi:include href="swamid-2.0/registry.swamid.se-saml2-metadata.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 664b226f..5518bf59 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -43,4 +43,5 @@
   <xi:include href="swamid-2.0/dev.idp.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/pilot.idp.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/a0251.srv.lu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.lu.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>