1 files changed, 28 insertions, 54 deletions
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index 90897ac9..063b19a2 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -5,15 +5,15 @@
       <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
       <mdui:UIInfo>
-          <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
           <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
           <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
           <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
           <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
           <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+          <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
           <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
           <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
         </mdui:UIInfo>
       <mdui:DiscoHints>
           <mdui:DomainHint>csc.fi</mdui:DomainHint>
@@ -26,58 +26,32 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDcDCCAligAwIBAgIQUhfimTnCU5OtZex2FUQejjANBgkqhkiG9w0BAQUFADA5
-MQswCQYDVQQGEwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEg
-Q2xhc3MyIENBMB4XDTEwMDEyNTEzMzAwMVoXDTEyMDEyNTEzMzAwMVowSzELMAkG
-A1UEBhMCRkkxJzAlBgNVBAoMHkNTQyAtIFRpZXRlZWxsaW5lbiBsYXNrZW50YSBP
-eTETMBEGA1UEAwwKaWRwLmNzYy5maTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAzu8G1w4ifXMuKnJvcbQpjz8FdiWYzIhAz4/MhFPleD1Vx7uq51sRgIDVz9yK
-KieQT8aPA/0BmncM4i9ysOXwkfm3sEe809OXJAN+eKL/9kLkkLi+W9MQ9Vb1/NJN
-HOrOkITWtca17F1ygMkiyZXqbFV2sm15kM2ctfaRl83ePhMCAwEAAaOB5TCB4jAT
-BgNVHSMEDDAKgAhKoKpYhNNePDAZBgNVHSAEEjAQMA4GDCsGAQQBgg8CAwEBAjBy
-BgNVHR8EazBpMGegZaBjhmFsZGFwOi8vMTk0LjI1Mi4xMjQuMjQxOjM4OS9jbj1T
-b25lcmElMjBDbGFzczIlMjBDQSxvPVNvbmVyYSxjPUZJP2NlcnRpZmljYXRlcmV2
-b2NhdGlvbmxpc3Q7YmluYXJ5MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAdBgNVHQ4EFgQUuwDNmQMhB1z0GctJso08rQDVOIIwDQYJKoZIhvcNAQEFBQAD
-ggEBAElbopYFDZ7OC0OtifaQbCo/UJRj/OnIUXEb7qLso2LNAc86Zhjbg5OhGQUz
-JJcbwhqnpbhXf9NPHESv+PkvTGtuywe/HZobhUcSVkMghfA8cv4ZvKd10/y4a6pF
-vLwNGS8uTgO4ey1to5R2CcKCjal5QX5T6K6JUUNTcqn++ciD+belkKztXj6meyiU
-UATZh6NGXUaLSoDqNki2UukAl8r67sx27mpLbLiq6hIeOL0wjhi46v48JLF0jeVU
-aFahF9tdcjjxkpH+EE+Yq7jt69bDdETfGqqOdIFouh8Mcp4X4B4zUrGgd871S2hN
-3B5OkHMv8SN0RjhDs8UR371oEaM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE+zCCA+OgAwIBAgIQPQJBKvIc9NRY+pPFe5hfBDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTAzMTAwMDAwMFoXDTEzMTAzMDIzNTk1OVowgYgxCzAJBgNV
-BAYTAkZJMRAwDgYDVQQIEwdVdXNpbWFhMQ4wDAYDVQQHEwVFc3BvbzEpMCcGA1UE
-ChMgQ1NDIC0gSVQgQ2VudGVyIGZvciBTY2llbmNlIEx0ZC4xEDAOBgNVBAsTB1Vu
-a25vd24xGjAYBgNVBAMTEWhha2EtaWRwMDEuY3NjLmZpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAt9O61taFpnXBLgpt9TIy9838XN93089o/ATNm9Yx
-JkrX8hqpCNHUM3bzsEe/X7hKcT5xjVxTiwacHw8kYP2YgVPz4HDLbL1wakiq2Mvb
-QFmYvcEw8YsA3AbZWn/QlrOgbP+e81aaUCWq3emm1QBoqTCidlczNetoCU+LuuUj
-EvvqWZaiGSacAZ9qzl7U5MmH7TYt6AovSlVrWZnNagLFaaxQsSt9ccgkVfAXupCq
-voSlF2VbuXWuK3GWEbELmR9LrSx5idX3JGnjIVjFOMYceBDsJJHLaicsiBgL3imt
-9EulnoY+5ifuKr5HGFkQzcF1Qsq2y3lLFVv3whLTGio+bwIDAQABo4IBsDCCAaww
-HwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHtybSZj
-YQP+ZNnxCQbK8njRX51hMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQB
-sjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
-aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
-BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMGgGA1UdEQRhMF+CEWhh
-a2EtaWRwMDEuY3NjLmZpgg9oYWthLWlkcC5jc2MuZmmCEWhha2EtaWRwMDIuY3Nj
-LmZpggppZHAuY3NjLmZpggxpZHAwMS5jc2MuZmmCDGlkcDAyLmNzYy5maTANBgkq
-hkiG9w0BAQUFAAOCAQEAtTZm+eCpS91dGyQxSK/N/OeO77b879QjODzaPuBmyJNR
-vJKNgWkBJy6oVSsLq2LnRoR1J//9JKkVQ31PfIk9qKX8B92EYUddUx2sBOQkvRK6
-QPURtxM38YsQXqZsgZX0eFSc4H/PZe0Zg4qT1bfoZle0ib1sKJpNO7G97YgnDDwE
-7+4aGUowa81gkiOBsyyUXiJdjv9+ldbBCbU3PkF16Csu7iNiuIXuD9NSGsATh/M1
-qoM8/s5WaIsU1mn7Cbyl4sprVCtObbbENDlkzMpiJ7qoTTVBewhdORXhrLzY8NJu
-9u4191s9DyJqzbzGfsW52la+QW4/tJJn6uYXBpcQfQ==</ds:X509Certificate>
+          <ds:X509Certificate>MIIEvjCCA6agAwIBAgIRANzJo7X5SEmbvBstb88M+4kwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMTEyMjEwMDAwMDBaFw0xMzEyMjAyMzU5NTlaMIGBMQswCQYD
+VQQGEwJGSTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UEBxMFRXNwb28xKTAnBgNV
+BAoTIENTQyAtIElUIENlbnRlciBmb3IgU2NpZW5jZSBMdGQuMRAwDgYDVQQLEwdV
+bmtub3duMRMwEQYDVQQDEwppZHAuY3NjLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAt9O61taFpnXBLgpt9TIy9838XN93089o/ATNm9YxJkrX8hqp
+CNHUM3bzsEe/X7hKcT5xjVxTiwacHw8kYP2YgVPz4HDLbL1wakiq2MvbQFmYvcEw
+8YsA3AbZWn/QlrOgbP+e81aaUCWq3emm1QBoqTCidlczNetoCU+LuuUjEvvqWZai
+GSacAZ9qzl7U5MmH7TYt6AovSlVrWZnNagLFaaxQsSt9ccgkVfAXupCqvoSlF2Vb
+uXWuK3GWEbELmR9LrSx5idX3JGnjIVjFOMYceBDsJJHLaicsiBgL3imt9EulnoY+
+5ifuKr5HGFkQzcF1Qsq2y3lLFVv3whLTGio+bwIDAQABo4IBeTCCAXUwHwYDVR0j
+BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHtybSZjYQP+ZNnx
+CQbK8njRX51hMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
+MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDEGA1UdEQQqMCiCCmlkcC5jc2Mu
+ZmmCDGlkcDAxLmNzYy5maYIMaWRwMDIuY3NjLmZpMA0GCSqGSIb3DQEBBQUAA4IB
+AQBo9n3P845t8Z4ib7SVF/dPa6Sa7zPCWIwFpnKrAgjtsgFQX8usixP7thxgxDfa
+yq91lqm8VBAmIjzMd8NS4TdckKtlmxh6178KR9KIRUyvWsI1L74ANGycs3eF84TQ
+YNFbjK64dwCnMNGfVw1zepuRBVE0BLklgn8wqQf6yKj1HzOB6UT4UUABt71zrdcS
+yv274zsJoe2SU6+POX6wH82lz5Vc9BkxLE8vBSGB78n4BFKSdEPRWIYkeq7Kwk8L
+MwFER9iEtf/HEH+CmxYoqZCr/mm7FduiAyOdQ+AZrQgvFP2c5sqxqhAwQyrW9eU/
+yDPlRNL+S5OBIx61TJQTJ1DZ</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>