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

Conflicts:
	swamid-sp-2.0.mxml

7 files changed, 81 insertions, 128 deletions

diff --git a/Makefile b/Makefile
index 27b75c23..991ee5d0 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,8 @@ swamid-ki-sll:
 	@test -s swamid-ki-sll-1.0.xml && cp swamid-ki-sll-1.0.xml $(DEST)
 
 test: swamid2-deps
-	@for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema  schema.xsd $$x; done
+	@for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x 2>&1 ; done | sed 's/fails to validate/&/;s/validates/&/'
 
 clean:
 	@rm -f *.xml *.tbs *.n
+
diff --git a/swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml b/swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml
deleted file mode 100644
index ec2f135d..00000000
--- a/swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3.ladok.umu.se/gui-httpd">
-
-  <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://ladok3.ladok.umu.se:444/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3.ladok.umu.se/gui-httpd</ds:KeyName>
-        <ds:KeyName>ladok3.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO+nGfYfHSo0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2xhZG9rMy5sYWRvay51bXUuc2UwHhcNMTIwNTIxMTUwMTE4WhcNMjIwNTE5
-MTUwMTE4WjAeMRwwGgYDVQQDExNsYWRvazMubGFkb2sudW11LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwmMN9JjN0RKJdh1mh6vUBjywQlC82JJ8
-UBhiJQ6zNOvNuMF2JcuwFdCsqx3z18E0PiOcpvwAvIHH0KLkuoqKc/UomJwFuEdk
-JEVjeWBdc6W5hNuC0OiHOd5M07sb0zFk+jf52rk3UuSo9Ubse9L5zoOLHJEf6Vlh
-1wu7Zv8yUkOk94ZCYzHO4RO1ZfFflQC8dyBNceJRYRRpCnq1VJy1J8SgHV96V1Tq
-2bO/hYBIhwd25ofRL+W7cl4HEf0cWUOXVDLvT0xE/2R6z/wBqD7x1Pw+RdwqS9RX
-HpQtw69pKTH3DWu0QWzH1EvNUE5Ke5qkUNq4/Okvzf/K9GzgxdvLzwIDAQABo2gw
-ZjBFBgNVHREEPjA8ghNsYWRvazMubGFkb2sudW11LnNlhiVodHRwczovL2xhZG9r
-My5sYWRvay51bXUuc2UvZ3VpLWh0dHBkMB0GA1UdDgQWBBRNSJMJDSu63CGSQuaN
-3TwINtU58TANBgkqhkiG9w0BAQUFAAOCAQEAkC7vpVsFZc3dSI7/CnFnG3twZZYl
-f3BxeSjsOO9LKJj0u/1hPVJ8qr+kj1qBSkczIyWlukODaxioEVeSyg0oDJxSR/Vb
-V/QeFI6VBVdDO+50wLQ1kCVA1UB6Z6I0X3K9ShrH4+4pHeyEHnsMwnY7OreWX8cT
-6w3oZW0wGZAcaaJjmjPYc6TYw/I0NOQFRHb0xz8PoLjOkAo4XIgrEfB3qa6wMxy4
-KLgWWs0w9Aop3/hPClDX5qdmhUbjr32CRGW6eIxpe9nCXA/+Mz+w7wSlzifX0Cu3
-78dYC4kSnI2mX2yhEGoGZEEND6D24Pkt2niikITmAKJVotkJk9ahoKj7YA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3.ladok.umu.se-user-idp.xml
deleted file mode 100644
index 24a6256c..00000000
--- a/swamid-1.0/ladok3.ladok.umu.se-user-idp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<EntityDescriptor entityID="https://ladok3.ladok.umu.se/user-idp"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">ladok3.ladok.umu.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBhTCCAS+gAwIBAgIJANsWgJWyj/bKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMME2xhZG9rMy5sYWRvay51bXUuc2UwHhcNMTIwNTIxMTUwNDM1WhcNMjIwNTE5MTUwNDM1WjAeMRwwGgYDVQQDDBNsYWRvazMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMNkxc/qnIuD3zwF7ePTTn+n0KYSi2dEho4oULnsnbskSIwlj6iPsQyjaCdZcI1uinwNAnIjMmGj0JgzmEiIZtsCAwEAAaNQME4wHQYDVR0OBBYEFCrhVGgs2M86Ew4oqWxb6TJ/KUWGMB8GA1UdIwQYMBaAFCrhVGgs2M86Ew4oqWxb6TJ/KUWGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCrw4ghUKcp7dxe1KZX14ZOvIuKd/lxtohDZhaY1yiDVokT5hPjTJNWozaVmsOLTctZUkTkBRv9sTlM4+5CVVOv
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://ladok3.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://ladok3.ladok.umu.se:8445/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
-                                   
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
-                             Location="https://ladok3.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://ladok3.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://ladok3.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://ladok3.ladok.umu.se:8444/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">ladok3.ladok.umu.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIBhTCCAS+gAwIBAgIJANsWgJWyj/bKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMME2xhZG9rMy5sYWRvay51bXUuc2UwHhcNMTIwNTIxMTUwNDM1WhcNMjIwNTE5MTUwNDM1WjAeMRwwGgYDVQQDDBNsYWRvazMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMNkxc/qnIuD3zwF7ePTTn+n0KYSi2dEho4oULnsnbskSIwlj6iPsQyjaCdZcI1uinwNAnIjMmGj0JgzmEiIZtsCAwEAAaNQME4wHQYDVR0OBBYEFCrhVGgs2M86Ew4oqWxb6TJ/KUWGMB8GA1UdIwQYMBaAFCrhVGgs2M86Ew4oqWxb6TJ/KUWGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCrw4ghUKcp7dxe1KZX14ZOvIuKd/lxtohDZhaY1yiDVokT5hPjTJNWozaVmsOLTctZUkTkBRv9sTlM4+5CVVOv
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://ladok3.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://ladok3.ladok.umu.se:8445/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/bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..6c218369
--- /dev/null
+++ b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
@@ -0,0 +1,78 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_b3efdc806b64e982d27de7ce6a96039139a91663" entityID="https://bedomningshandboken.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"/>
+    <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DisplayName xml:lang="sv">Bedömningshandboken</mdui:DisplayName>
+      <mdui:Description xml:lang="sv">Bedömningshandboken utgör, vid sidan om Högskoleförordning och Högskoleverkets föreskrifter, underlaget för antagning till utbildning på grundnivå och avancerad nivå. Den utgör även grund för den överenskommelse som UHR har med universitet och högskolor som genomför sin antagning med stöd av det gemensamma antagningssystemet NyA.</mdui:Description>
+      <mdui:InformationURL xml:lang="sv">https://bedomningshandboken.uhr.se/</mdui:InformationURL>
+    </mdui:UIInfo>
+  </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://bedomningshandboken.uhr.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://bedomningshandboken.uhr.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>bedomningshandboken.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=bedomningshandboken.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIICxjCCAa4CCQCKyKhsQJuOvzANBgkqhkiG9w0BAQUFADAlMSMwIQYDVQQDExpi
+ZWRvbW5pbmdzaGFuZGJva2VuLnVoci5zZTAeFw0xMzA0MDQwNzU0MzVaFw0yMzA0
+MDIwNzU0MzVaMCUxIzAhBgNVBAMTGmJlZG9tbmluZ3NoYW5kYm9rZW4udWhyLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkgQbPG77UHm5R1PUSqa
+RBOWDnSXEtXQriWKg/Rf760O1KOgqnlJ2rRoWjht38sO1/SeAb14KzEiZimO/9v1
+ZJgrV2FEq8zjVPRvYXSmMltzdx8UJ3jbz4SLNcASOnUoay3VxiegNQXAvtM4NP2E
+B+eEvNwr6MuUm2RULVHW2XAXD+TWtf3hSBlVL7fQPHXyngou9nqGmjKOSLpiYk/k
+TK8bPzd3Qh7q5rI3fpj9yGAyGFK5BCF/Fe/isQPk4bf/qv3N1gjR9NHeMDAZ6KVh
+POjzl2qd6h7VjRwWK4cSYB4KA/ERh9CIydnY1oEbK9h96ZmuzageLHiDoZsGnX/8
++wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC4KOo9PINl62jHOjoddC3key+qfFxD
+RIMJkRzDWRtkbEzmNOFdOxzAVZt56Ji8Cot05T7K6x9Vh+pLyeu2uGKT+9V247y1
+hwvA2QW0x8QqjtbUDkm9MEFhInCh3mNGRh9QFskMVK5fZNByXuSIJloQb19pB48D
+whnDlL5OLft7mLy8TGqK7cokIppZ55QnlAHSpuBh6Mm/hcfBBMLTDdj5ydLhV26I
+EGWYSrJbdzVpEMKEE2hlSsuq0rYXH0yk3MHEZbyjeontkh8bJt6PaCCnj817GcnA
+ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI
+</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://bedomningshandboken.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bedomningshandboken.uhr.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 63954609..f27993c0 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -42,4 +42,5 @@
    <xi:include href="swamid-2.0/ci.nordu.net.xml"/>
    <xi:include href="swamid-2.0/www.akademiskahogtider.se.xml"/>
    <xi:include href="swamid-2.0/testshib.msacademicverify.com.xml"/>
+   <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index d9253483..eb09952f 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -80,7 +80,6 @@
   <xi:include href="swamid-1.0/idp-test.kau.se.xml"/>
   <xi:include href="swamid-2.0/box-idp.sunet.se-idp.xml"/>
   <xi:include href="swamid-externals-2.0/elegitimation2-test.inloggning.se.xml"/>
-  <xi:include href="swamid-1.0/ladok3.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-1.0/referens-idp.skolfederation.se.xml"/>
   <xi:include href="swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-1.0/minastudier.ladok.umu.se-user-idp.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index e10b9944..8d76d277 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -266,7 +266,6 @@
   <xi:include href="swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-1.0/test-chalmers.pingpong.net.xml"/>
-  <xi:include href="swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml"/>
   <xi:include href="swamid-1.0/minastudier.ladok.umu.se.xml"/>
   <xi:include href="swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>