From 7cb8c7433d0143909b13661640529244191ff6b3 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Fri, 29 Apr 2022 17:18:58 +0200
Subject: SWAMID-879 Updated konto.hb.se

---
 swamid-2.0/konto.hb.se-Shibboleth.xml | 168 ++++++++++++++++++++++++++++++++++
 swamid-2.0/konto.hb.se-shibboleth.xml | 154 -------------------------------
 swamid-sp-2.0.mxml                    |   2 +-
 3 files changed, 169 insertions(+), 155 deletions(-)
 create mode 100644 swamid-2.0/konto.hb.se-Shibboleth.xml
 delete mode 100644 swamid-2.0/konto.hb.se-shibboleth.xml

diff --git a/swamid-2.0/konto.hb.se-Shibboleth.xml b/swamid-2.0/konto.hb.se-Shibboleth.xml
new file mode 100644
index 00000000..ffd428d5
--- /dev/null
+++ b/swamid-2.0/konto.hb.se-Shibboleth.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://konto.hb.se/Shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-11-22T11:58:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://konto.hb.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://konto.hb.se/Shibboleth.sso/Login" 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://konto.hb.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://konto.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+      <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://konto.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
+      <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://konto.hb.se/Shibboleth.sso/WAYF/login.idp.eduid.se"/>
+      <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://konto.hb.se/Shibboleth.sso/https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Konto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Konto</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Applikation för att skapa identiteter på Högskolan i Borås.</mdui:Description>
+        <mdui:Description xml:lang="en">Application to provide identities at the University of Borås.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>hbsp.ad.hb.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hbsp.ad.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID7jCCAlagAwIBAgIJAN3NZDofjibUMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMTDWhic3AuYWQuaGIuc2UwHhcNMTgxMTA1MTI1MTM4WhcNMjgxMTAyMTI1MTM4
+WjAYMRYwFAYDVQQDEw1oYnNwLmFkLmhiLnNlMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEA0s7wHBYSHfIIQBBF+yQ5ketWsLspmRlhouWOiyoe0oXC8QfV
+JzGi48C81pY4gFy+FGr9PRWfNMSVgXlNWsHl6wXjA0zVuS01rXp/Lha0+2WEQN91
+DfQBlQpTv7B5l/oP2cWCavEUnxD63eGDz3zEpuFP2wOrYLMto5sI7OYT7bhheh6d
+ycDgkHrNBCQP0FldotREUm5sfJJbptkj3a2Hj10Ir+hlPbGM0vXhlUIsxnixI4iZ
+RtCA9lzZPQIzIv+L5a3R9bGrbBoTRig75yLLuWaGQ+kGrDzdVoxaIFFdRrA5jm12
+ErRZgsYrXKcmRwzr8veXodSy8sNNtdgPyOrEtEEWsHIEuKuGqKhJECKXgJJuZhdN
+hhV8G6Ye+EwcfmN6gU0uJlib7MpoyqaHxLMLopbeBRhK5012BswD/RaffG62SYQv
+hyASyaecjpiowdDp7m20Tn5f59kiLySd3P+pZOK4touohGMgmRvfHr0yqxi8fWaG
+hqbNc8KVnWhJiu3HAgMBAAGjOzA5MBgGA1UdEQQRMA+CDWhic3AuYWQuaGIuc2Uw
+HQYDVR0OBBYEFO0DzgqpZgPzeb70K4I60lLqDYwwMA0GCSqGSIb3DQEBCwUAA4IB
+gQB/m/HLPYbKZFK85Mmp1EzC4EASv8PggxUJ8o5uYFqifPAotmJtgvXJPOPNy9m0
+EsL2cGYmWMiqwaio6ZbibNZurHbFW25aQFzpxFgDAmjV31z929lOjupRtcJIPsHZ
+ywMFrS85Y8FTZnzdx9QEDY9JQN6smHhPX57aEUrY/gEyWE3M89jKiLy4SnAFxU9R
+iJOBL1L2FzLJuw9r4RpWVpE+/8azUExWkX3Dg4ETGVGdFUs/mdkna7is4ivRGZ35
+q682hBadypi91PD2ztzeFApV4w1xuXUv6hRd31Q1tqACbsMuA9MVp9d+hgmT3nFR
+Di7GpTrX3L27qcAEyvbNlLFlf5MEKn60QJiVEFPRvBL+r4pp56tahFm2pbYkbIZh
+7xGFvHck6j5t8Jkw8eaNeFxQ0BH9VXGDwGDqHXai7mqeOmHS9PnpVdWNmX0tNtQn
+bJWhml0emo2rBoAqqVRmo/WwLpfc1g3HEinDgC/5sOefPZL1fLGwbrQKtL1qnSnl
+sQU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>hbsp.ad.hb.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hbsp.ad.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID7jCCAlagAwIBAgIJAKdew3mrNlhLMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMTDWhic3AuYWQuaGIuc2UwHhcNMTgxMTA1MTI1MTM3WhcNMjgxMTAyMTI1MTM3
+WjAYMRYwFAYDVQQDEw1oYnNwLmFkLmhiLnNlMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEArUL46WChMTf3h8AgkcmQaxDHV2kogN7jg0qDGR30zg5Le/4C
+dsGSKusBInRqy3GnRLIxONNIwM+dw5NPtZNpNLR/o2Sul1SIDIsTvxjQXzbNGok1
+cl9lc3+Xuid4ipTGmsbUULmHddNgArCziQf8IywFBFVoR/pCCWVlN270dNWHTSdz
+cXtZw2NcON+hBfkSanj2U34HVhoaOzqH5m1lW7VfwbbaSpugcMUNvgy8GGCCsQXW
+7NXVNJ33GbZZPqs35NLRh6WRCxDs+Zl2r6+Uc27HdjLQGsjqz1JdsYU07BRCXvBx
+KAWAQ+RExAU+HMB/gNTaPjwVKb9MH5JYm6euuHF9UomQCmNkjxUK/k2wtKIpxHDc
+4EwCD11GqsxoWG8FHl9CF4hr3aGx36vSYexcXYeUJAAtzbWKUBpSfjAlYpghvW9a
+ypNvgkIB3YX636LVl65dLH59SXA2Z3gNUNKemHzb/Cg/TgdQjzuA8M5+mzogXG0J
+c5Si7H2FNJZAFUObAgMBAAGjOzA5MBgGA1UdEQQRMA+CDWhic3AuYWQuaGIuc2Uw
+HQYDVR0OBBYEFMsWUqTNQAcoUU5dTxont01sMKI3MA0GCSqGSIb3DQEBCwUAA4IB
+gQCg/km6kEbsjayx+HocSm7TNlxQz7kWxCC54KeXctt3tx7woYDgkSDHbIDTFIxE
+1tqkHxC27wpXpYou9Lm8JGKiwSAvxM3xtsQIALXnQq2apvQUiw+Yhnd8Izx+32Um
+57Ula85OjlNJI0ivWlAQRUwGxE/WxI5OQirfz/uF1/3kmbRdvzMXnpg1BXkzKrCP
+IWoka2Ls/2iC6cj7TgYJjIZD8FpXXnXLJO64kNC/G2dCn64UbX4OHTF0hAWiM/08
+ijxAGulhwUnM66L0JNrQu/44TqNjm0wj4NKsuMv9Gvs4PUP9+y/usdbKuayx12C8
+lWJf1RHEt6es9Q31UpwJoAdxYj24t6uZQvuCPFRNwjD3KUzdrGEP8L/kscrv4BXH
+jPdlx+R5JLMrmgvgFfj5pbb4sMThV9c+YG8X7NhO0KSpF+3tcm4d2ALJX4PwCZYr
+ZIWp0BkfmRasnk1z1GK1MwMYhdPFKVm6ummbW82AcJgnBz1kGRvB1NQ/8BwjPIHx
+toA=
+</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://konto.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.hb.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.hb.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">konto.hb.se</md:ServiceName>
+      <md:ServiceName xml:lang="sv">konto.hb.se</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>University of Borås</md:Company>
+    <md:GivenName>IRT HB</md:GivenName>
+    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/konto.hb.se-shibboleth.xml b/swamid-2.0/konto.hb.se-shibboleth.xml
deleted file mode 100644
index 05138e72..00000000
--- a/swamid-2.0/konto.hb.se-shibboleth.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://konto.hb.se/Shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-11-22T11:58:31Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://konto.hb.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://konto.hb.se/Shibboleth.sso/Login" 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://konto.hb.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://konto.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-      <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://konto.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
-      <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://konto.hb.se/Shibboleth.sso/WAYF/login.idp.eduid.se"/>
-      <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://konto.hb.se/Shibboleth.sso/https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Konto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Konto</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Applikation för att skapa identiteter på Högskolan i Borås.</mdui:Description>
-        <mdui:Description xml:lang="en">Application to provide identities at the University of Borås.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp.ad.hb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp.ad.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID7jCCAlagAwIBAgIJAN3NZDofjibUMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
-BAMTDWhic3AuYWQuaGIuc2UwHhcNMTgxMTA1MTI1MTM4WhcNMjgxMTAyMTI1MTM4
-WjAYMRYwFAYDVQQDEw1oYnNwLmFkLmhiLnNlMIIBojANBgkqhkiG9w0BAQEFAAOC
-AY8AMIIBigKCAYEA0s7wHBYSHfIIQBBF+yQ5ketWsLspmRlhouWOiyoe0oXC8QfV
-JzGi48C81pY4gFy+FGr9PRWfNMSVgXlNWsHl6wXjA0zVuS01rXp/Lha0+2WEQN91
-DfQBlQpTv7B5l/oP2cWCavEUnxD63eGDz3zEpuFP2wOrYLMto5sI7OYT7bhheh6d
-ycDgkHrNBCQP0FldotREUm5sfJJbptkj3a2Hj10Ir+hlPbGM0vXhlUIsxnixI4iZ
-RtCA9lzZPQIzIv+L5a3R9bGrbBoTRig75yLLuWaGQ+kGrDzdVoxaIFFdRrA5jm12
-ErRZgsYrXKcmRwzr8veXodSy8sNNtdgPyOrEtEEWsHIEuKuGqKhJECKXgJJuZhdN
-hhV8G6Ye+EwcfmN6gU0uJlib7MpoyqaHxLMLopbeBRhK5012BswD/RaffG62SYQv
-hyASyaecjpiowdDp7m20Tn5f59kiLySd3P+pZOK4touohGMgmRvfHr0yqxi8fWaG
-hqbNc8KVnWhJiu3HAgMBAAGjOzA5MBgGA1UdEQQRMA+CDWhic3AuYWQuaGIuc2Uw
-HQYDVR0OBBYEFO0DzgqpZgPzeb70K4I60lLqDYwwMA0GCSqGSIb3DQEBCwUAA4IB
-gQB/m/HLPYbKZFK85Mmp1EzC4EASv8PggxUJ8o5uYFqifPAotmJtgvXJPOPNy9m0
-EsL2cGYmWMiqwaio6ZbibNZurHbFW25aQFzpxFgDAmjV31z929lOjupRtcJIPsHZ
-ywMFrS85Y8FTZnzdx9QEDY9JQN6smHhPX57aEUrY/gEyWE3M89jKiLy4SnAFxU9R
-iJOBL1L2FzLJuw9r4RpWVpE+/8azUExWkX3Dg4ETGVGdFUs/mdkna7is4ivRGZ35
-q682hBadypi91PD2ztzeFApV4w1xuXUv6hRd31Q1tqACbsMuA9MVp9d+hgmT3nFR
-Di7GpTrX3L27qcAEyvbNlLFlf5MEKn60QJiVEFPRvBL+r4pp56tahFm2pbYkbIZh
-7xGFvHck6j5t8Jkw8eaNeFxQ0BH9VXGDwGDqHXai7mqeOmHS9PnpVdWNmX0tNtQn
-bJWhml0emo2rBoAqqVRmo/WwLpfc1g3HEinDgC/5sOefPZL1fLGwbrQKtL1qnSnl
-sQU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>hbsp.ad.hb.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hbsp.ad.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID7jCCAlagAwIBAgIJAKdew3mrNlhLMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
-BAMTDWhic3AuYWQuaGIuc2UwHhcNMTgxMTA1MTI1MTM3WhcNMjgxMTAyMTI1MTM3
-WjAYMRYwFAYDVQQDEw1oYnNwLmFkLmhiLnNlMIIBojANBgkqhkiG9w0BAQEFAAOC
-AY8AMIIBigKCAYEArUL46WChMTf3h8AgkcmQaxDHV2kogN7jg0qDGR30zg5Le/4C
-dsGSKusBInRqy3GnRLIxONNIwM+dw5NPtZNpNLR/o2Sul1SIDIsTvxjQXzbNGok1
-cl9lc3+Xuid4ipTGmsbUULmHddNgArCziQf8IywFBFVoR/pCCWVlN270dNWHTSdz
-cXtZw2NcON+hBfkSanj2U34HVhoaOzqH5m1lW7VfwbbaSpugcMUNvgy8GGCCsQXW
-7NXVNJ33GbZZPqs35NLRh6WRCxDs+Zl2r6+Uc27HdjLQGsjqz1JdsYU07BRCXvBx
-KAWAQ+RExAU+HMB/gNTaPjwVKb9MH5JYm6euuHF9UomQCmNkjxUK/k2wtKIpxHDc
-4EwCD11GqsxoWG8FHl9CF4hr3aGx36vSYexcXYeUJAAtzbWKUBpSfjAlYpghvW9a
-ypNvgkIB3YX636LVl65dLH59SXA2Z3gNUNKemHzb/Cg/TgdQjzuA8M5+mzogXG0J
-c5Si7H2FNJZAFUObAgMBAAGjOzA5MBgGA1UdEQQRMA+CDWhic3AuYWQuaGIuc2Uw
-HQYDVR0OBBYEFMsWUqTNQAcoUU5dTxont01sMKI3MA0GCSqGSIb3DQEBCwUAA4IB
-gQCg/km6kEbsjayx+HocSm7TNlxQz7kWxCC54KeXctt3tx7woYDgkSDHbIDTFIxE
-1tqkHxC27wpXpYou9Lm8JGKiwSAvxM3xtsQIALXnQq2apvQUiw+Yhnd8Izx+32Um
-57Ula85OjlNJI0ivWlAQRUwGxE/WxI5OQirfz/uF1/3kmbRdvzMXnpg1BXkzKrCP
-IWoka2Ls/2iC6cj7TgYJjIZD8FpXXnXLJO64kNC/G2dCn64UbX4OHTF0hAWiM/08
-ijxAGulhwUnM66L0JNrQu/44TqNjm0wj4NKsuMv9Gvs4PUP9+y/usdbKuayx12C8
-lWJf1RHEt6es9Q31UpwJoAdxYj24t6uZQvuCPFRNwjD3KUzdrGEP8L/kscrv4BXH
-jPdlx+R5JLMrmgvgFfj5pbb4sMThV9c+YG8X7NhO0KSpF+3tcm4d2ALJX4PwCZYr
-ZIWp0BkfmRasnk1z1GK1MwMYhdPFKVm6ummbW82AcJgnBz1kGRvB1NQ/8BwjPIHx
-toA=
-</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://konto.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.hb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.hb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">konto.hb.se</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 467577ab..78479d30 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -447,7 +447,7 @@
   <xi:include href="swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml"/>
   <xi:include href="swamid-2.0/slltest2.luvit.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/stillalive.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/konto.hb.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/konto.hb.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/filesender.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.integrationstest.ladok.se-student-sp.xml"/>
-- 
cgit v1.2.3