1 files changed, 43 insertions, 41 deletions
diff --git a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
index c76aac8b..8c6b72d8 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
@@ -1,49 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.helsinki.fi/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.helsinki.fi/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helsinki.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Helsinki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Helsingfors universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Helsingin yliopisto</mdui:DisplayName>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDYxNTAwMDAwMFoXDTE1MDYxNTIzNTk1OVowgbcxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
-BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
-HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
-bnRlcjEaMBgGA1UEAxMRbG9naW4uaGVsc2lua2kuZmkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDrQpyohqDuaPxlOQDkWC/I/aw1ZhYMjLVDEx7x6XxR
-W9C5J4tTXpYYT3Us+oEUSJObhBTSm9EQ0tbDqnZjubwWZDkXHr1tnyP+JCFoFTZ/
-tqV768I3fE3TKdgEY3paVM8MWZPoyJf4uy1dKCz5lwie3anIYNVXw6mlPqbI9zAT
-b5elTMn+cBw9dML4dAQVODTuDJ2+avRMO4ItuqEj5f5PdI0HUjLU2ejRUQLP2nNX
-2MWgtweWvTIS/IWO1neE3Kn8v3j1VLdS3Xk2t/UBSeGl5e6MARhiHbLtigAWuIZv
-1pznlwdppBOzACm0e3somcJrbFnFOnbGmRQKtXq2yQJ3AgMBAAGjggFkMIIBYDAf
-BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUqm3ksXlN
-/umZswjtgICNhBMvWlAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRbG9n
-aW4uaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBACHDbip+j9xIvdz0WXvF
-4jhBCz4FoGoe7THcFwhVZL8oO3pKGyFHvAFQjdxibgWimOjYQyEnRoE2NYi27ccj
-S3hTQ3xcxoN6Zwq7Nq7iFNmQJ6Lc2uimU5zW7tLRqlTWQKKUm6/niFYv598Mg0PT
-NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
-9W8PdlbMcU04uznzo1v5EggbllAoFoqgWLL36H9zkbkh9NpA3a3j0PyvPaQHzwaC
-54RgRywzt/5g35mU+1cX4gTxt3aP6buBLAaEVtDJ+XQcfZJj3KhPQ2oo2y6Z6fNd
-Ahw=</ds:X509Certificate>
+          <ds:X509Certificate>MIIFnDCCBISgAwIBAgIQaa2rCkgYcvukeleEtUvyozANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNTA0MjcwMDAwMDBaFw0xODA2MTMyMzU5NTlaMD8xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRbG9naW4uaGVsc2lu
+a2kuZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+9NToC10zJ71
+Akre2PbHsI2Qzpdi0vFdlDh9W7BtFqz/4fpX/xe92EaGpDIxS06gSjl1XB4jGjbq
+6YUVXbu9Tg/FxGxfGt/lsEyvHrzyt3EdDQlm2Tn+WVwe5CDbLKsxAeC2nKUJPgdc
+8KT5iyKUAfyU/XK3TgBn0zuyM9XrI/C2bQfNgCF9KfrJALIUI6/Y+s8VCHTzQnwy
+NEZPdTtnb/8XNhKbf+UH42vGjRWH6loRN/6ZLg7t0FICvS73CtBxlh2IA6Qr0fNf
+ThgeLr7R3IuY7Mff8Fpg1N/3uy85Pi79Lsfo6dbY0CAolgVvFKtZQVh4U1LzpvuF
+RttfOqMCruEgTA+3LUkBbQCY0bU43AqDByDHDnw+CU8+ivjw99OI2292cLVd1cFC
+Y6Wx1fBgJps+d85fWFsz9kppYeAv7PLbMEesj4OPXGYAF84bBmrdNwcl0SoAVfzZ
+WTAAJZdxGAKsSpEdokQu7gsAXegLTFGCrSkxI/9337ZeMLd6LJyrWYxXFmxk6R5u
+owmZwKHxXOpq37ZlJksnCAghvoNjqdA0WBQeXNCrwrScWIdQIWBJCLYj/pYIBckZ
+Axvjm21cAgLl98lnCtWG3HG2t4GykxCsgtdY8hPw0Ze/oXBZpTY78DKD0pOW6ndj
+WGgtjZWiW6yrj8mlV8hWqCULfS/rfwIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAU
+W9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMqg7/cYdb2o9CSfG4wtgFrc
+gwH9MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
+DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20v
+VEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUF
+BzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMBwGA1UdEQQVMBOCEWxvZ2lu
+LmhlbHNpbmtpLmZpMA0GCSqGSIb3DQEBCwUAA4IBAQCJ2I4mTHMYM2SZuAf9XI2x
+Lk/VLU8LqZOGc5yvQCdLG3iLz6xkUU/ESG4Nrwyl8MN8IB/ul3bbZVriZ+htb4R4
+CmB44srsj10lKAHcCDYbxUNj+EbewMXkXqBybjkqlih5JjdlH1eA72M8aDvtHIi9
+7YOfX0qkuYX1MC17UL+IlD1Ed5oSdckyPUCDrTksNmZ3AegQVJlDmk8KL7xXm6qZ
+1JFj+dX1uM1cPa0sf0ZK6fI8aOhPhKz+usclFplwR7ohnEp60S3KgH9VbhHpjItj
+DjLzl9rFbErZuexB3N7XJhesfd5IwneNaJ2oVjJZB9gzknuG6bwrURgOA8sHcxV0</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>