1 files changed, 70 insertions, 27 deletions
diff --git a/swamid-2.0/konto.hb.se-Shibboleth.xml b/swamid-2.0/konto.hb.se-Shibboleth.xml
index 6922980e..fe6d909d 100644
--- a/swamid-2.0/konto.hb.se-Shibboleth.xml
+++ b/swamid-2.0/konto.hb.se-Shibboleth.xml
@@ -23,6 +23,7 @@
     <mdattr:EntityAttributes>
       <samla:Attribute 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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -74,39 +75,81 @@ q682hBadypi91PD2ztzeFApV4w1xuXUv6hRd31Q1tqACbsMuA9MVp9d+hgmT3nFR
 Di7GpTrX3L27qcAEyvbNlLFlf5MEKn60QJiVEFPRvBL+r4pp56tahFm2pbYkbIZh
 7xGFvHck6j5t8Jkw8eaNeFxQ0BH9VXGDwGDqHXai7mqeOmHS9PnpVdWNmX0tNtQn
 bJWhml0emo2rBoAqqVRmo/WwLpfc1g3HEinDgC/5sOefPZL1fLGwbrQKtL1qnSnl
-sQU=
-</ds:X509Certificate>
+sQU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>hbsp01.hb.se</ds:KeyName>
+        <ds:KeyName>https://hbsp01.hb.se/idp/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hbsp01.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFGzCCAwOgAwIBAgIUInhDX+eyZDWPH4O5dGuUJFnfZhcwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAxMMaGJzcDAxLmhiLnNlMB4XDTIyMTExNzEwMjIzMFoXDTMy
+MTExNDEwMjIzMFowFzEVMBMGA1UEAxMMaGJzcDAxLmhiLnNlMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEA2XHnvpB9gsUKpnYJbKz59imCvqTd4fRP3sBW
+jGEWrrWORDjueWcr2fx22/GLUeYDs+WNgk4xwBlvUd/GLIQeID1oI9LbvX1pff85
+5OAutiVmuNx2LuyNVPBSb6Ul7tYjLDr3sJaRYvqFBWvuOCVJv9dSoszun84Hj3lt
+RhBgS45Kh5m8/hwscBKu8H10terI3vCup1EJY3ZBmwI0MuQs9pFPP4N407q94WsP
+hHWUt8rIoTdvA5o41LztfFOQQqI5rIejuzD/CSUk8Dys9hS6VBA6Ga7ldasjp6Xl
+F++v1Qy0ZeGyeKc1ErNMRHDjEKX3Sjx0IH2XjSzVoXw4EsIGddOmKtQYsMHJC6Zu
+3jkamqjJvsZqvwf2PuJKP8JLA4+U2bOBiWHKfoZPGfHUAgSmOWIjnSff9M3wJhe1
+SeP7YbpFgeUFHurH5O/bKyqRzPa2cdsdkrWJ2v8tfJNCCnLIoejVJ730ULPKrTq/
++uTLoFfMsAzQZV3sdGxJIk5kIpTZvBwbQkYiS2qqN1Apmc/X4AgemDbezbVPAHLH
+MC8VFsmgOPPprPc6byq4zN78E63F4xu/4MBq71n0Y7nzzvKgRwhRuEQe7vn2nerP
+CeaYsgIiI5VNAFv1fP/px9jUmM70HrfZackR+qx+JUcfGFwJAM2I7zu9007IMJQm
+OGVgK/0CAwEAAaNfMF0wPAYDVR0RBDUwM4IMaGJzcDAxLmhiLnNlhiNodHRwczov
+L2hic3AwMS5oYi5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUpcSH/muQX7MW
+SiER4LMoc/DAxjswDQYJKoZIhvcNAQELBQADggIBABt4UKqP/nehQCkrWrXkxKnS
+QY8XaJ8PAnKNQ98h8EsHHOQYyCTOgZJ9N6Ni3styXy+Pq5gyaB9ZqQ/glEy3IhgI
+GE79bw3W8TFHA1RWfbs2bU2q+2183y2D83WNm8q1HymE6KDgdUaHHdE8LqAMWyg9
+9ZrDk90aDC4tpNJ7NS9Rtzyh09bt8EZca4jfl79C/1HNFCRNPs+Wp6FrHAi4xgYI
+2RXfq+1T59Dz1MxKpzKQx7Ua9+cEQBSfFk9nEB59MX3aOidTHf3mOFD232Mi22cW
+KXtCaITM0LT0U+Qygwf1eVGAiPvr91tJKjyRtJJFizqkgXWtEO7jCobwWfR782G+
+UtSOkanXpOJ5BlnMaupeaxYKhmnGZJQLGkW7dzuvSYL3c7a33ZCuzgVz1RqoAEca
+w2k9sNS2F0uREmKFlmLQ+WbuM7fYWejnzOVyKYHy02a3oZaJzRoNChZJEg3arx8I
+ZLN1fd0ux2toTjfJ8QQpW5+/VHBM+aLeIYba8uF3iY7DFg8dyFzJ+Ewejb9oDDlO
+vje7i/OcgawgOHYRbhD0lS+a+sBiSKnojeSjnc4XQJPJbjoTsIPvN1amXL4bLBRJ
+ydBPr2KrsqXTZHuDrGKyunX0w6iBai6OGWNvSywHQxZdiwZ9u6HgCkbllNTdFysH
+TsKcQzQuxcOQfNZYa6lp</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>hbsp.ad.hb.se</ds:KeyName>
+        <ds:KeyName>hbsp01.hb.se</ds:KeyName>
+        <ds:KeyName>https://hbsp01.hb.se/idp/shibboleth</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:X509SubjectName>CN=hbsp01.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFGzCCAwOgAwIBAgIUbp6JHcI03k+BGitTVBDA9twzybwwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAxMMaGJzcDAxLmhiLnNlMB4XDTIyMTExNzEwMjIyMFoXDTMy
+MTExNDEwMjIyMFowFzEVMBMGA1UEAxMMaGJzcDAxLmhiLnNlMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAzNEl6CCQtLuxba4vFbgFddi2boT5e9+mcFk2
+Yf9mgqGr3LUuNEgaRwkBOMuLKcebz+SvspRVl90z2ZgXmbaE6rP1gKHL99EGt75b
+eq9lGKDLnP9IYMYOBI9s9ISMeihxHpLYdPjjRoKmjp2bOic9Eawg/c/MQ9K6clcr
+xrAkhIRPJizxHVWFvc2sa5L1v2LwCrKOx99LaxrgnaG1DHTekd09+wjoEI6wlGYd
+p1BiPynD5WZ4D5EAFEu5zbrZSkEl7Lqev2uxSygLqWWEMCfQF2eBMyUxa1dt6UDs
+2okkPlqdg0ff/S46uavd83hSXgxI4arGI87m/Rf7IRM6AeCKIKjhl5GMgoCpGnct
+bYAT1cyzSd22eS/xz8Ie2T1buULIy11Bhpd1A98tv0diL+jpJxtJ1BKeDbHQ5v+0
+yRE5isYzJczClkZl617ZETVh2u0FrF9k+vGAbN5vnjgX3eQPEacJ2jafUGSAp8/E
+nN+x/aal9hqz0yqsFra/wkXQqbv4aGSkhHuAPI9dsmnEHPm78E/jJnI0jBICsIPC
+fs36O8J82UYjRNXCquwQlDlsmwstWF6l6aJK9B0ed6WtrIvW7oOpf6tQiYNBkaIp
+pUCKAgIpqmMBXsr07pLCSRbJz9o3OJ3D7LqLvtklsjte2/NGoOmDaWnE6iyDTiZM
+EIr7Ux8CAwEAAaNfMF0wPAYDVR0RBDUwM4IMaGJzcDAxLmhiLnNlhiNodHRwczov
+L2hic3AwMS5oYi5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwQiJjAbwRSbW
+/SulCJzCOeKlym4wDQYJKoZIhvcNAQELBQADggIBALmJRRLUfOHYsOLwE/O0Sn5P
+wq625xJl6IfMWvIAc4BKb6Z+yXrciZ1oi+ywqtYR6QUz2h1Ug2yLnkBU8Q7ORtjF
+FnORqGXvWyZ0mWaMZCpQtpKOdOrzKkDcmjXRWgvouPbH0y6tN91JzWANypJJ89W5
+FAkB+QBIs26BUTDHHfagQ2uN9UesumyszWkgvQNRNdViS49w2W7Fey9bM8vKzVSR
+RNHhLZ5tOVem1EuLtEMDgUJO7SVlSu/w4FKBHPo4jwc2E7JqrcKOlWdukwosZDJX
+Kfza1bPFp0KziNUgiNtM505tNtaPijhIdzafBGbe7Rq+Evu+BkUdQR9oOLM4uJIY
+Sf459o8OP1Y2EnsOKMc6nH7IzxnasgaI+a5ujvYmzeG3QCvYfEvJ1J3yeGnHdmFK
+YH2T1HKd2gAFZvYxt5PkXdz2mcSHYeeGcL8Y0HU9XSWZLB2+UufB+gSjb1rh/lOd
+ZLjuCq+krs2fwpK3A0dCKMd74q3KbE6f+kXiPBAqK0UGOwC4+u6Cm9MD8Fwf8rRj
+pzVBK2HEmNYqObZTddqURGg6SXApJ1BUu17WMJwNLN7WyYu/Vjar2Y1ag7HNhLeS
+v/iMef0sDFMdY4WC3k7mnu5ZU746XIhcjkbfiB7/idFy+6EWQ1eqw6Q3DKTtXM3W
+vH2eM/0keUOIsYEs4PT8</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>