https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-1.0

10 files changed, 146 insertions, 174 deletions

diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index 9fc4a8cd..cf7729ee 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-interfederations-1.0.xml">
-<xi:include href="swamid-interfederations-1.0/agw-sparknet.utu.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml"/>
@@ -9,16 +8,16 @@
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs2.efif.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs2.efif.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.umit.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml"/>
@@ -34,15 +33,9 @@
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-zbc-module.php-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.au.dk.xml"/>
-<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
@@ -61,10 +54,16 @@
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-zbc-module.php-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/clarin.ids-mannheim.de-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/clarin.oeaw.ac.at-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-1.0/clarino.uib.no-.xml"/>
 <xi:include href="swamid-interfederations-1.0/clarin.phonetik.uni-muenchen.de.xml"/>
+<xi:include href="swamid-interfederations-1.0/clarino.uib.no-.xml"/>
 <xi:include href="swamid-interfederations-1.0/compute.deic.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/data.deic.dk.xml"/>
diff --git a/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml b/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
deleted file mode 100644
index 796e6c69..00000000
--- a/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://agw-sparknet.utu.fi">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQOWGPWke4DcPypq61jxi5UzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDcxMDAwMDAwMFoXDTE3MDcwOTIzNTk1OVowQTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNhZ3ctc3Bhcmtu
-ZXQudXR1LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvw38LEvp
-djnLwfGCyajCi1K1HPSphIC7giATYbMuYWQzp1e74nlM7MYm0rM/Czv7KjV2bvqA
-Cb0BGylc4JaISlab2ZFw1geHye/x5AF0kpyhVLwOg+zciExR7rNjrj1bVoO6zh+d
-x3LI+8w3stbS6be+fq/VWM/q34+3WGYQY0MY51W6A3Q9CgsOUrj02KNi/mUIrexH
-XuIPSmPe9Iko17DwOaRa4zdaXs67HuzCwXqn4iEsLxLJhb50SJs4ZxpXNY5ICtZg
-MaRhhVDgd8Eb5UfbkNSo5UmhYT31I1dPf3RubXRL3N21FftxRDPuVr//STBV5n1v
-7cHxhNXBVS+ZkQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFKQCEfwC/cdgSYAfdae2dUQzjho6MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNhZ3ctc3BhcmtuZXQudXR1
-LmZpMA0GCSqGSIb3DQEBBQUAA4IBAQApc0jVKsilWfjGxVMut0c7nn0tDMh30lGZ
-4PXpc6u8+HY4jGJccPLNEOA9ECqQBnxKcqN+xxvRI/XiiFOS6G/a/MaEPyYhQvcg
-foDsvA5LzyQyxLmf/yhYQbIBxhb1nVH1NOwsbwJWotYn0A/wFkWVYUGYxILmfu0Z
-8gg0SwCNooAwlQLG0wvbROgDYXqkomPuflWNeDSJl48OsAnRVnspMmqTdc3UFH8E
-+IPl4VMqhboXM0LB9u97ubaAdR+2A3bws+wqC+GbdlUsHOrWV/BqNFcSjznn3Q/r
-6r8ROTllHa97gLvSaSYorIAj0//d8l5k7DU/afiUTXiX4/9rKRDy</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agw-common.sparknet.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agw-common.sparknet.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Turun yliopiston SparkNet</md:ServiceName>
-      <md:ServiceName xml:lang="en">University of Turku SparkNet</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Sparknet, Turun yliopiston langaton verkko</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Sparknet, Wireless network of University of Turku</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mikko</md:GivenName>
-    <md:SurName>Niemi</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Mikko</md:GivenName>
-    <md:SurName>Niemi</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
index 98350b43..ec266706 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
@@ -14,8 +14,8 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">basyd.dk</shibmd:Scope>
       <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
-        <mdui:DisplayName xml:lang="da">Erhvervsakademi Kolding</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">International Business Academy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="da">IBA Erhvervsakademi Kolding</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IBA International Business Academy</mdui:DisplayName>
         <mdui:Logo width="164" height="100">data:image/png;base64,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</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
@@ -45,11 +45,11 @@ UBE=
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/sso.basyd.dk/adfs/ls"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="da">Erhvervsakademi Kolding</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">International Business Academy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Erhvervsakademi Kolding</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">International Business Academy</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="da">IBA Erhvervsakademi Kolding</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">IBA International Business Academy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">IBA Erhvervsakademi Kolding</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">IBA International Business Academy</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="da">http://www.iba.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.iba.dk/internationalstudies</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.iba.dk/international</md:OrganizationURL>
   </md:Organization>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
index 8982949a..992ebf7b 100644
--- a/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
@@ -7,8 +7,8 @@
         <mdui:DisplayName xml:lang="en">Aalto University</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Aalto-universitetet</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
         <mdui:Description xml:lang="en">Aalto University students, faculty and employees.</mdui:Description>
+        <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
@@ -45,6 +45,47 @@ ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGjDCCBXSgAwIBAgIQQBGYQlL1yp2E+vYQYv24ajANBgkqhkiG9w0BAQsFADBE
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMR4wHAYDVQQDExV0
+aGF3dGUgRVYgU1NMIENBIC0gRzMwHhcNMTUwNDAxMDAwMDAwWhcNMTcwMzMxMjM1
+OTU5WjCByDETMBEGCysGAQQBgjc8AgEDEwJGSTEdMBsGA1UEDxMUUHJpdmF0ZSBP
+cmdhbml6YXRpb24xJDAiBgNVBAoMG0FhbHRvIFVuaXZlcnNpdHkgRm91bmRhdGlv
+bjESMBAGA1UEBRMJMjIyODM1Ny00MQswCQYDVQQGEwJGSTEOMAwGA1UECAwFRXNw
+b28xDjAMBgNVBAcMBUVzcG9vMRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEVMBMGA1UE
+AwwMaWRwLmFhbHRvLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+3CGuAp1bJJx+nyb6vKbP1vO8kaGk7+hz9i5R/X3gmmgwOrDhzV0xLqk/9m5Qe6xC
+36D4AMMvnfuHNOaRBLocFhKuHOyHWNjx6j/pd2/CP8V/jJpPUPl82qxpEAnuw+H7
+te/YjuvOUVSmpKIi77spkpCV1I6/T7LNFjTGlANVXXu1L3jcDfiRxzebOPD9DrK0
+EuaaL+P5psr4osRYrrdUvG3/xwb60wvwOectvoqivUu9O/ripAaf8RsxSTzsgPCH
+OSpnCFP1MMelxsqGV3RcCDefmTrHnrYGL0tmq2r6ef9JUN5tsvFdNhtz8e+LlcMN
+UY7UOKRB5syT1knOfnXNUQIDAQABo4IC8zCCAu8wFwYDVR0RBBAwDoIMaWRwLmFh
+bHRvLmZpMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQkMCIwIKAe
+oByGGmh0dHA6Ly90aS5zeW1jYi5jb20vdGkuY3JsMHMGA1UdIARsMGowaAYLYIZI
+AYb4RQEHMAEwWTAmBggrBgEFBQcCARYaaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9j
+cHMwLwYIKwYBBQUHAgIwIwwhaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0
+b3J5MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBTw
+cFHa0yqRT1J314Z3dA/OcRpsIjBXBggrBgEFBQcBAQRLMEkwHwYIKwYBBQUHMAGG
+E2h0dHA6Ly90aS5zeW1jZC5jb20wJgYIKwYBBQUHMAKGGmh0dHA6Ly90aS5zeW1j
+Yi5jb20vdGkuY3J0MIIBfAYKKwYBBAHWeQIEAgSCAWwEggFoAWYAdQCkuQmQtBhY
+FIe7E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAUx0jHICAAAEAwBGMEQCIEWc+I70
+mCckrqkWBkKgNUnXIKzSHwehkzTf2Ei+TjKiAiBG229TlnJfxeVCv3wTlYdQBIWD
+4ai3kgtwa44yAuCvlgB1AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDd
+AAABTHSMcuQAAAQDAEYwRAIgXai9EFYbpbvu6tLF2U+j2NXWvYXNY3QfYzfRaZBw
+ivUCIAjuh9BNjpHhbwy2sGVNDW03h+BZT7vl6Y3aAFq1OyWyAHYAaPaY+B9kgr46
+jO65KB1M/HFRXWeT1ETRCmesu09P+8QAAAFMdIxyMQAABAMARzBFAiBd1pYbyvxQ
+a8wJoV0UJ1oMMNelMzft3Cs1bOcH9WDSogIhAJUaVVoWyEYYaP1tzXQG6n8x2dVi
+f13tQdj8DT/JNK59MA0GCSqGSIb3DQEBCwUAA4IBAQA8b/jud9ETQ1M29j/8YzTp
+iKt9i8vc/SfL7aJ7Ph8l8hZCijz54H0z6yzcNQf3u0MhDcJwQXos9359dIoYLnYk
+7J/hqoSuTFcvB3qcxzsmSsH7wO2ZnQKqFqBbqKmHblmgjNQ2Ghci1TpX7JqmPaWU
+JOxkAOiCKGJuSiaQd4JBZx1XOJc8X1sJ1O0ULJtCTBfjvp+mbDKyT0D/V10My2+S
+0WSH3K4frOs8CoeVBiW7y6y3jSQv2f7ZxOBqypOflXh5/44e+O3CGwtbJ0U1+6q3
+6CemocV2CDzExQbpt7NmW8ijME6yBnXJclsnDSVIbyAQLWoIu1IUqiPdHrPHTD3m</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
diff --git a/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
index 95966b16..474fcc1b 100644
--- a/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
@@ -4,18 +4,18 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
-        <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
+        <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
+        <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
         <mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
         <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
         <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>abo.fi</mdui:DomainHint>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index 910da65c..dbf2043d 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -324,6 +324,7 @@
       <shibmd:Scope regexp="false">ntg.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oks.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
index 57c10bf8..3a646157 100644
--- a/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
@@ -4,22 +4,22 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
-        <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Tampereen teknillinen yliopisto</mdui:Description>
-        <mdui:Logo height="300" width="300">https://www.tut.fi/TTY-ratas/TTY_ratas-300x300.png</mdui:Logo>
+        <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
         <mdui:Logo height="16" width="16">https://www.tut.fi/TTY-ratas/TTY_ratas-16x16.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
+        <mdui:Logo height="300" width="300">https://www.tut.fi/TTY-ratas/TTY_ratas-300x300.png</mdui:Logo>
         <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints>
-        <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
-        <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
         <mdui:IPHint>193.167.88.0/21</mdui:IPHint>
+        <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
+        <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
         <mdui:DomainHint>tut.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
       </mdui:DiscoHints>
@@ -63,44 +63,6 @@ ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
   </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
-TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
-1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
-mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
-jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
-c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
-iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
-A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
-R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
-Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
-7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
-DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
-ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
diff --git a/swamid-interfederations-1.0/idp.uniarts.fi-shibboleth.xml b/swamid-interfederations-1.0/idp.uniarts.fi-shibboleth.xml
index f260f485..5b65e273 100644
--- a/swamid-interfederations-1.0/idp.uniarts.fi-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.uniarts.fi-shibboleth.xml
@@ -6,12 +6,12 @@
       <shibmd:Scope regexp="false">teak.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">uniarts.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Taideyliopisto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of the Arts Helsinki</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Konstuniversitetet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of the Arts Helsinki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Taideyliopisto</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Konstuniversitetet</mdui:Description>
-        <mdui:Description xml:lang="fi">Taideyliopisto</mdui:Description>
         <mdui:Description xml:lang="en">University of the Arts Helsinki</mdui:Description>
+        <mdui:Description xml:lang="fi">Taideyliopisto</mdui:Description>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
@@ -48,6 +48,41 @@ o6vPiIhyHwH6qkmI6GmPr9Gkoc2C8Gdle23I3Tac</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFYjCCBEqgAwIBAgIQDFUHKZG+WuHiN314H6DJ9jANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMzAeFw0xNjEwMDUwMDAwMDBaFw0xOTEwMTAxMjAwMDBaMIGqMQswCQYDVQQG
+EwJGSTEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UEBxMISGVsc2lua2kxKDAmBgNV
+BAoTH1VuaXZlcnNpdHkgb2YgdGhlIEFydHMgSGVsc2lua2kxMzAxBgNVBAsTKlRp
+ZXRvaGFsbGludG8gLyBTb3ZlbGx1cy0gamEgSW5mcmFwYWx2ZWx1dDEXMBUGA1UE
+AxMOaWRwLnVuaWFydHMuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDCvnisDcSZNfEh7HekklcQZHoPQZqKq56PCM4kQK8TgieGuET/F/Xw43xYmiEp
+xAfSAeJhKI/nY9gInMFEMmr+CNqVq8CBgff83EjQ/Zt/ljreGzGWc3x4N3t19cb3
+XduTYc2ofWjVkQyjdFoDxYyWVKWC4fOvIfJmoFxivWaoltxtD1YP+nOB5JJJzs1K
+veMbRJaw/H3f44DcvOcI9MauEImh2KI3mbZJEux6yumDEfKa+8hziTX5z8XEzH+W
+/drrorW4yyhWRUO7zAuG/9cfzeZMBb2iATGgEE9suSm/E7HVcZGqkGlUaLoQMfZm
+2Zh82Dze8MUmw9YISMsLvga7AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/Ygg
+FCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQU0SmuwzXQOvr6VQP0sfDXtJJ5Rjcw
+GQYDVR0RBBIwEIIOaWRwLnVuaWFydHMuZmkwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRw
+Oi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0
+cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUw
+QzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNl
+cnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzAB
+hhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9j
+YWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQC
+MAAwDQYJKoZIhvcNAQELBQADggEBAChryIxaWuewmU3CRKegf28/VGrkWBI66lJ/
+C8ISn9lfF/IkThwoFXaLFUS5anpQDhyhEGIod3VtONbsY1bpcyCkoXaY5HXAVz1i
+R1S2ewVJuKxcerO5JSCovYB71KFMpZD48o7R1MpPDDEnSB2jq/1lgQgF/NX3nrDs
+/PZQF/Ards9K+4NTXC8QDDiVjweuWDJt0cReCzs613kcO38j8LGgPFCcINvP06j6
+gOprWQHf2iwA2wqG0qQ0+Jevg8L7FBPea1OOwKyofX7Grb1jAY15mNmXBr87isO6
+SiWQC8hTlutqN0M6k698OQfJjvxJJemUoy9VlfGiRpzo3u7/RxE=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniarts.fi/idp/profile/SAML2/Redirect/SSO"/>
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
index b8217741..86e784d3 100644
--- a/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -5,9 +5,9 @@
       <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>uwasa.fi</mdui:DomainHint>
diff --git a/swamid-interfederations-1.0/portal.clarin.inl.nl-.xml b/swamid-interfederations-1.0/portal.clarin.inl.nl-.xml
index ecd37fa2..6f7d8be6 100644
--- a/swamid-interfederations-1.0/portal.clarin.inl.nl-.xml
+++ b/swamid-interfederations-1.0/portal.clarin.inl.nl-.xml
@@ -19,37 +19,38 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEx
-MDgyNTAwMDAwMFoXDTE2MDgyNDIzNTk1OVowgdIxCzAJBgNVBAYTAk5MMRAwDgYD
-VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
-aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
-EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTETMBEG
-A1UECxMKSW5zdGFudFNTTDEdMBsGA1UEAxMUcG9ydGFsLmNsYXJpbi5pbmwubmww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+faM4kQs7smclVpmqWzzX
-ZbhhPBW4ulwloBRQY7iR0unaMAGbxobpHvar28sASdvZ7W8IL+Az2J714pceJpit
-s/1Q10cJBzmcopvHtR4Hp6PZxjdEUljrCifQt+IZeZw99TMH4gpeC9zhAdzyubFs
-d452dy8+oljTOlTumbr1zACGU5ZGUInru467GJtMHYTJDDS1/BGuVx0XKwo0idCC
-goGF8ZIxyHQq/2Q37Py10238nKx614U6KtE//dHP5KkLEHow1Vfm90N+czIkRt+4
-4jl91Cel58jfvjXF3I/Cspi7vFDjRMaeBHsrxtDBWVUOo9GSMWRUiCOeQvGASXcb
-AgMBAAGjggHYMIIB1DAfBgNVHSMEGDAWgBQ/1bXQ1kR5UEoXo5uMSty4sCJkazAd
-BgNVHQ4EFgQUbmgntbNatGZ2IBRNLqazqtbpwGAwDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
-IAQ/MD0wOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
-dXJlLmNvbW9kby5jb20vQ1BTME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwu
-Y29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0Eu
-Y3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jcnQuY29t
-b2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0
-MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
-MIIUcG9ydGFsLmNsYXJpbi5pbmwubmyCGHd3dy5wb3J0YWwuY2xhcmluLmlubC5u
-bDANBgkqhkiG9w0BAQUFAAOCAQEARI37zQIk6P0aQkSMyambDpkm+ciyvWTur0Z4
-wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
-ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
-JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
-EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
-zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
+          <ds:X509Certificate>MIIF8zCCBNugAwIBAgIRAOmDjkikKV8bZXBlonKu/E0wDQYJKoZIhvcNAQELBQAw
+gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD
+VQQDEzNDT01PRE8gUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBT
+ZXJ2ZXIgQ0EwHhcNMTYwODExMDAwMDAwWhcNMTcwOTIzMjM1OTU5WjCB1jELMAkG
+A1UEBhMCTkwxEDAOBgNVBBETBzIzMTEgQloxFTATBgNVBAgTDFp1aWQtSG9sbGFu
+ZDEPMA0GA1UEBxMGTGVpZGVuMSEwHwYDVQQJExhNYXR0aGlhcyBkZSBWcmllc2hv
+ZiAyLTMxMjAwBgNVBAoTKVN0IEluc3RpdHV1dCB2b29yIE5lZGVybGFuZHNlIExl
+eGljb2xvZ2llMRcwFQYDVQQLEw5JbnN0YW50U1NMIFBybzEdMBsGA1UEAxMUcG9y
+dGFsLmNsYXJpbi5pbmwubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCvLz7CXK+pmYsVZ5mpj+RoNjBlf3mtfi4yNCPhDkYWCnblbx9Q5YmIPuvhkf2y
+/U1Knaxg/2bK/k+jR65xvmPB7PYJ1rccUhhwq4W1US6HJjs4g8ZulUlN49sFKfJD
+a9uJZWaDx/hiZc/wYxtvm2z4sG4Wq6yZ0h/fFefWcqZmb+iTsTfKaaB/NQOQuVY1
+3TMqb3HMTaKLLZRILeToVQXtpZlDsKZtZqKG7c/keqERwnUR0GlZf7tYildpXitX
+FVuBsUsaTT+E/uiCir9vNtjUjdUR37dyFnf770gtnHRjklu0S1cLYxFOi71faNvC
+SYJejB/wlIS1qCIIqwLXYMOvAgMBAAGjggH4MIIB9DAfBgNVHSMEGDAWgBSa8yva
+z61Pti+7KkhIKhK3G0LBJDAdBgNVHQ4EFgQUZv15LjjmkGC9RlEs1kfbRdN6JA0w
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYMKwYBBAGyMQECAQMEMCswKQYIKwYB
+BQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECAjBa
+BgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9S
+U0FPcmdhbml6YXRpb25WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGLBggr
+BgEFBQcBAQR/MH0wVQYIKwYBBQUHMAKGSWh0dHA6Ly9jcnQuY29tb2RvY2EuY29t
+L0NPTU9ET1JTQU9yZ2FuaXphdGlvblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5j
+cnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTA5BgNVHREE
+MjAwghRwb3J0YWwuY2xhcmluLmlubC5ubIIYd3d3LnBvcnRhbC5jbGFyaW4uaW5s
+Lm5sMA0GCSqGSIb3DQEBCwUAA4IBAQALmuxJdfXfi1vXZc3ebcOLCZAEcIPtoz/f
+GVKnBwyWLBadv3ubBZOL2qXG4b3OyfnqG1QXY9uG8iTrTq8FSTMV3d4Z5ORUMGC9
+Gkn964AqCccDuYnHbNqhOt4Cc5eI8PjgAvEzMs1vXyDJ9RmwbSCp7flKUQqgJQjN
+VGdzlwSWSNwf9RggP8V4qSYQ0Kj5ik7LUHigNbskq5pnDUkyEIiPcnrd0eknX0nt
+qLdav4UMegWjLcqQMyl/4drZzpa6iJ5VBoY0Tm+TyGwAE1bvrTGLFEJsWN2ognvY
+7hgYhaxp1bITI2kxWrJ6vSX4Gof6D0sq0npLOeO8vkfoVR0C15Xu</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>