Merge branch 'master' of git.swamid.se:swamid-metadata

2 files changed, 91 insertions, 90 deletions

diff --git a/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
index a4f372d2..9e2c8536 100644
--- a/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
@@ -1,6 +1,25 @@
 <?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://confluence-test.it.su.se/Shibboleth.sso">
   <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-28T16:12:58Z">
+      <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"/>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-05T14:39:54Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
@@ -11,10 +30,12 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence-test.it.su.se/Shibboleth.sso/WAYF/wavelan" 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://confluence-test.it.su.se/Shibboleth.sso/SWAMID"/>
+      <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://confluence-test.it.su.se/Shibboleth.sso/SWAMID" 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://confluence-test.it.su.se/Shibboleth.sso/WAYF/idp.it.su.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://confluence-test.it.su.se/Shibboleth.sso/WAYF/idp-test.it.su.se"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Confluence test vid Stockholms universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Confluence test at Stockholm University</mdui:DisplayName>
@@ -22,73 +43,54 @@
         <mdui:Description xml:lang="en">Confluence test at Stockholm University</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>confluence-test-app1</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=confluence-test-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAJQUUOiUg8ASMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGNvbmZsdWVuY2UtdGVzdC1hcHAxMB4XDTEwMDgyNTExMjk1MloXDTIwMDgy
-MjExMjk1MlowHzEdMBsGA1UEAxMUY29uZmx1ZW5jZS10ZXN0LWFwcDEwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD3uzS0TzAX9UDxeTLasLorhR1rU2o
-fvADYWfz6drVXKKOszC58UmQ30+ks6J+90S2TOk9TuYUOkehaGnzGPLq1YqIV7x4
-P2z7iRIIvGH5dNVI7C5iIS83WOF5XQtARtiR2IzZxcfZC+1bXMzv+FeQk27Cyg5b
-go1tKzjnJENNFbaLNZghXBZkwJRbI989p/mydIKbyfO8k8tWN+nOgWncjwuvEXdD
-j1cYBMgPJbmXWjzoRN6CRc0OjPyswCbiB3l5Jc/8ddh7TxjHx+MOloJLSABwdi/0
-EWjxJQZuJrRC6it4fnfjFX/C4r8p6DtdCJhLdfVN/s1IvbDwuqRTUYV9AgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGNvbmZsdWVuY2UtdGVzdC1hcHAxMB0GA1UdDgQWBBR8
-x5c7zq1zB49voRdZxIAGX3uNRTANBgkqhkiG9w0BAQUFAAOCAQEAQE1qdCNGxQ+D
-eoCw6J1Xz7pTMrztfiJrk48+Yn4MQ48D+kgB0vRpY6jL0DNHrnXziQFqlx9E1boJ
-F0JpeKOrFav+pkmiCw+paDwURg1+Eh7hwt8cMwkTpb7Pl29TZxLlrlvCm4rBp91R
-+FVbzcyCJWvmle/PwusArj+I4TqwZDmb9kNNeENfxRT/pBjfbOKqJGAhJiz4BuBg
-a/C1W3rYB0JDWS1GBFsYrsPAYA23B4F4DtaHtUz9LVhBCI90ldxWaFQQN9tSuULf
-ZKpdnb5jA70+hVxEavkcihAmu6B3bcGTIO7ycrdcE31iW8VIXGf2jOictM35XLhU
-Uc3kqnPScQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>confluence-test-app1</ds:KeyName>
+        <ds:KeyName>confluence-test-app03.it.su.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=confluence-test-app1</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAJQUUOiUg8ASMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGNvbmZsdWVuY2UtdGVzdC1hcHAxMB4XDTEwMDgyNTExMjk1MloXDTIwMDgy
-MjExMjk1MlowHzEdMBsGA1UEAxMUY29uZmx1ZW5jZS10ZXN0LWFwcDEwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD3uzS0TzAX9UDxeTLasLorhR1rU2o
-fvADYWfz6drVXKKOszC58UmQ30+ks6J+90S2TOk9TuYUOkehaGnzGPLq1YqIV7x4
-P2z7iRIIvGH5dNVI7C5iIS83WOF5XQtARtiR2IzZxcfZC+1bXMzv+FeQk27Cyg5b
-go1tKzjnJENNFbaLNZghXBZkwJRbI989p/mydIKbyfO8k8tWN+nOgWncjwuvEXdD
-j1cYBMgPJbmXWjzoRN6CRc0OjPyswCbiB3l5Jc/8ddh7TxjHx+MOloJLSABwdi/0
-EWjxJQZuJrRC6it4fnfjFX/C4r8p6DtdCJhLdfVN/s1IvbDwuqRTUYV9AgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGNvbmZsdWVuY2UtdGVzdC1hcHAxMB0GA1UdDgQWBBR8
-x5c7zq1zB49voRdZxIAGX3uNRTANBgkqhkiG9w0BAQUFAAOCAQEAQE1qdCNGxQ+D
-eoCw6J1Xz7pTMrztfiJrk48+Yn4MQ48D+kgB0vRpY6jL0DNHrnXziQFqlx9E1boJ
-F0JpeKOrFav+pkmiCw+paDwURg1+Eh7hwt8cMwkTpb7Pl29TZxLlrlvCm4rBp91R
-+FVbzcyCJWvmle/PwusArj+I4TqwZDmb9kNNeENfxRT/pBjfbOKqJGAhJiz4BuBg
-a/C1W3rYB0JDWS1GBFsYrsPAYA23B4F4DtaHtUz9LVhBCI90ldxWaFQQN9tSuULf
-ZKpdnb5jA70+hVxEavkcihAmu6B3bcGTIO7ycrdcE31iW8VIXGf2jOictM35XLhU
-Uc3kqnPScQ==
+          <ds:X509SubjectName>CN=confluence-test-app03.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEITCCAomgAwIBAgIJAPUmGmGyWqstMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
+BAMTHmNvbmZsdWVuY2UtdGVzdC1hcHAwMy5pdC5zdS5zZTAeFw0yMTA5MDcxMjAw
+NTFaFw0zMTA5MDUxMjAwNTFaMCkxJzAlBgNVBAMTHmNvbmZsdWVuY2UtdGVzdC1h
+cHAwMy5pdC5zdS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBANid
+Wl3U/VzfZE7Q2rNL0vTs6hLELEMPYHLfqgQ28z9J2kqB//ZFbcOZ80yYPTu44iVn
+pozwL0PnB3WcZ5PjyN8WtKyekPLs62uAUTixtdxKfIUVT9Mr3p8x81Vrp9hBo7Ne
+MNNEbWLUXnM4pvUyUyBuFYLUERjHd8/bwzuVKQurA03cyfyLdf0z51tAqjQ8fDoE
+y078h9pFQHtK0VfTKK3KLW1xPbzu0ZP4wF2jB207WDJQ9wC7Gh3ScOub4eBkrEHC
+vVyk3+jcLZsDikNtEEZuqkAxq97me80QqbOUX1Arbscu0vDVqrzyM4KlIpxDTdjS
+WQZB1HozvfNyIV40CRxslZxLVJE6eksD5PpCOjjLJtffodt0qaF7rkVbTE2tf1O+
+/YAjs81xuKitZI3M6r+S0OfK3FpXa0mT0h1QrfI9eTWqU5UAetl483g5HubrItdD
+1kjJPP3KKQqXoz446jpfGLBk4T1RFwdyfzrQlDL7PzGqJAXOhjxy8ofMNB1ZYQID
+AQABo0wwSjApBgNVHREEIjAggh5jb25mbHVlbmNlLXRlc3QtYXBwMDMuaXQuc3Uu
+c2UwHQYDVR0OBBYEFFMHLIGF1siHyqqMvu2fGUjVIH25MA0GCSqGSIb3DQEBCwUA
+A4IBgQB/zV+Hd9+XF1J1Yd8y8UEyfSvc/1hdzCcCh5rmZUCKBhbH5d0nNbQezqPm
+3U8ZoMptpaB/wZRbU1CByZPCpFpBMq/09RE53/4iXDeE4BqN0bTrbwnYM/qJDxEg
+t5mHr79fr7VFOGVHpYm7feSO3mTJuCPR06pOcEErHFPmgHmgqupjK2N/e+CQYKzd
+seIrBo4lz117O2/JMzKjRzRgJraAelinFL6cu4TbVaVneyOkhlOR8qFtcEx+i5Mm
++bW7bPBFQIioFpS5Ik3tQeb/beLMmAb1vnUsyqxiByqshIXVIy7zlhjzqvuHIsow
+r3Of2b76/705PzMWVH0QOFG5dI/Vp4UaAnT7G7M33KcCDGMLyX1h1jRm0evRY2wV
+DkVi8rhkhfC+HzhCzFd3B6LlNbtzEY74JOI01xktNRKmGJ4UC5oZkjtO4lYWzzqR
+i4lRFrKqh1ze2OqqLROzei117aGJXO+xaa57MR28HkFBqQ7pClyDm5GCZye/4U/d
+KnSuicI=
 </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://confluence-test.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence-test.it.su.se/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence-test.it.su.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.it.su.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence-test.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence-test.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
diff --git a/swamid-2.0/tse-uu.sitevision.se.xml b/swamid-2.0/tse-uu.sitevision.se.xml
index 5fc6dbff..54116fbf 100644
--- a/swamid-2.0/tse-uu.sitevision.se.xml
+++ b/swamid-2.0/tse-uu.sitevision.se.xml
@@ -1,7 +1,7 @@
 <?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://tse-uu.sitevision.se">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-31T13:50:04Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -21,46 +21,45 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://www.uu.se/en/about-uu/data-protection-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <!--NEW KEYS-->
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIGAXurtKACMA0GCSqGSIb3DQEBCwUAMD8xJTAjBgNVBAMMHGh0dHBzOi8v
-dHNlLXV1LnNpdGV2aXNpb24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwHhcNMjEwOTAzMTI0
-OTA2WhcNMzEwOTAxMTI0OTA2WjA/MSUwIwYDVQQDDBxodHRwczovL3RzZS11dS5zaXRldmlzaW9u
+          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIGAXwnOIRSMA0GCSqGSIb3DQEBCwUAMD8xJTAjBgNVBAMMHGh0dHBzOi8v
+dHNlLXV1LnNpdGV2aXNpb24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwHhcNMjEwOTI3MTIy
+NjI3WhcNMzEwOTI1MTIyNjI3WjA/MSUwIwYDVQQDDBxodHRwczovL3RzZS11dS5zaXRldmlzaW9u
 LnNlMRYwFAYDVQQLDA1zaXRldmlzaW9uLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA5eLpk60kj9wBApyB+O0CoA/JaaxlfpE4shQi3phInHlR7nnsUE9iobZ4dQslkvmUgN+po43E
-xla1Z2IIEmLl7IzZ1VAiN9xhP9S3Rc2cOwbQVTq7CN4VopdlGuNx7vJTN0Qsk4pudJPJ/RXmAp8h
-cVU63X4bihEFeJfT4MzFMqVAlPpofsZjwaEXseauNbmh5HPNveGF0+8C8EbxiRwY2khMrENmuXiE
-0OgjLDCPoBuTPT70EZhLmjYsDIJAGGTMWiF/PdBFcXGkpUMK/MlVtRYm0sX3k8G0dv04zoQwW9Tv
-aoEBgf6vl5ZYliwvj1Ci37N3vv+Uy+nQWq/9bLBI8wIDAQABo0IwQDAdBgNVHQ4EFgQUxU50zibJ
-dcLcSjOSnefKBAcENlUwHwYDVR0jBBgwFoAUxU50zibJdcLcSjOSnefKBAcENlUwDQYJKoZIhvcN
-AQELBQADggEBAALcnUO8jTqfK/cdpVkh2qsGVuFFCuksPyvh9Dq67oML+vIZlMUI2l838o/2SEqp
-CSi7mNkqycSojW383UFldIwRxvsgMXMy0MuqsHDI0vU9rhVVRrMPXJxdpJVLtmNco4TnZ/mXgkLW
-JoQ6gJmkoGoddTbjPn1AT/F6+XLa7FVnYEYcserSwIRmGJKzEtfex13b7nHqrxtpO46DK+jp0Lod
-P//M79QAHcfGCLMZH7+iuIxDfx5L8kOIN0iD/OvGN1lGNMmuRX6+xpTYFcOKIsrZQbC7xTgsncet
-zqVCy7/EyGdfQ3K1LOfGbEYuGHnydTvR/bn4w8YzRqH7Ec/lLEU=</ds:X509Certificate>
+AQEAi3me0vMItXRg6BPMdiv6eWrEypoaBqeZNVAnREihu6r/NaATVQFt+42VTQ+6jBT052g95D0s
+UXRu6TGbydMHKXo4Tr15LUGh5b8zzXezoB3C9YumOJz7JDJaQWXe+dxpjzFt8zsWMJhUy6JU4bNz
+oKv0koI5cOgxj/ulxu7PvUraqRbMo6DvSxYgl1E//e3SADrhyPVrNLCPaceN4iWWxxwmHrvlRVbX
+wIqNXSA+Jh9lP57+rF7UUVy46gDMADbaGrYbl2tzqgZYVy4i6+LS8L9mRyafjXJZednn1sl0a2CA
+stsuBKMpa6xctcWGM/tr7Tlx1qLW/zQw08FIg3/FZwIDAQABo0IwQDAdBgNVHQ4EFgQUEeBjpZP/
+NOTjMRcDKT3dHpLSAU8wHwYDVR0jBBgwFoAUEeBjpZP/NOTjMRcDKT3dHpLSAU8wDQYJKoZIhvcN
+AQELBQADggEBABeXkJ+ct5Hw5uCqZiQ3dTETQpZT/M3X0fZhc7YSWOFuSamfdxn7BR9K60pNGuhC
+XzZFGLsOZhh1OOOIxzRhXh46iq2+eQbG5ipw0ZG/23Iu4t8lOt8i+cGhD+8h36Tvl8sM4ISJcuW9
+vLv56ACZA8BLRcwSqcseQbCVFAUaGp6rEU/d9lNEJJimatZINTDxmXd0YeayXgKaJ/nzIdAR66OD
+OA9uZJcCONq4H80tG4Wyv1zy1NVJqXXrUpA2kOh4ohg6QhO7Gn7DY6omP9hs2SaEc+WCNaF/sWOH
+FqM4z0PPyDlL5pC7Qqq7GgU6EJnEHpc8CoD0mJi30LFC77tKuXo=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIGAXurtKACMA0GCSqGSIb3DQEBCwUAMD8xJTAjBgNVBAMMHGh0dHBzOi8v
-dHNlLXV1LnNpdGV2aXNpb24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwHhcNMjEwOTAzMTI0
-OTA2WhcNMzEwOTAxMTI0OTA2WjA/MSUwIwYDVQQDDBxodHRwczovL3RzZS11dS5zaXRldmlzaW9u
+          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIGAXwnOIRSMA0GCSqGSIb3DQEBCwUAMD8xJTAjBgNVBAMMHGh0dHBzOi8v
+dHNlLXV1LnNpdGV2aXNpb24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwHhcNMjEwOTI3MTIy
+NjI3WhcNMzEwOTI1MTIyNjI3WjA/MSUwIwYDVQQDDBxodHRwczovL3RzZS11dS5zaXRldmlzaW9u
 LnNlMRYwFAYDVQQLDA1zaXRldmlzaW9uLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA5eLpk60kj9wBApyB+O0CoA/JaaxlfpE4shQi3phInHlR7nnsUE9iobZ4dQslkvmUgN+po43E
-xla1Z2IIEmLl7IzZ1VAiN9xhP9S3Rc2cOwbQVTq7CN4VopdlGuNx7vJTN0Qsk4pudJPJ/RXmAp8h
-cVU63X4bihEFeJfT4MzFMqVAlPpofsZjwaEXseauNbmh5HPNveGF0+8C8EbxiRwY2khMrENmuXiE
-0OgjLDCPoBuTPT70EZhLmjYsDIJAGGTMWiF/PdBFcXGkpUMK/MlVtRYm0sX3k8G0dv04zoQwW9Tv
-aoEBgf6vl5ZYliwvj1Ci37N3vv+Uy+nQWq/9bLBI8wIDAQABo0IwQDAdBgNVHQ4EFgQUxU50zibJ
-dcLcSjOSnefKBAcENlUwHwYDVR0jBBgwFoAUxU50zibJdcLcSjOSnefKBAcENlUwDQYJKoZIhvcN
-AQELBQADggEBAALcnUO8jTqfK/cdpVkh2qsGVuFFCuksPyvh9Dq67oML+vIZlMUI2l838o/2SEqp
-CSi7mNkqycSojW383UFldIwRxvsgMXMy0MuqsHDI0vU9rhVVRrMPXJxdpJVLtmNco4TnZ/mXgkLW
-JoQ6gJmkoGoddTbjPn1AT/F6+XLa7FVnYEYcserSwIRmGJKzEtfex13b7nHqrxtpO46DK+jp0Lod
-P//M79QAHcfGCLMZH7+iuIxDfx5L8kOIN0iD/OvGN1lGNMmuRX6+xpTYFcOKIsrZQbC7xTgsncet
-zqVCy7/EyGdfQ3K1LOfGbEYuGHnydTvR/bn4w8YzRqH7Ec/lLEU=</ds:X509Certificate>
+AQEAi3me0vMItXRg6BPMdiv6eWrEypoaBqeZNVAnREihu6r/NaATVQFt+42VTQ+6jBT052g95D0s
+UXRu6TGbydMHKXo4Tr15LUGh5b8zzXezoB3C9YumOJz7JDJaQWXe+dxpjzFt8zsWMJhUy6JU4bNz
+oKv0koI5cOgxj/ulxu7PvUraqRbMo6DvSxYgl1E//e3SADrhyPVrNLCPaceN4iWWxxwmHrvlRVbX
+wIqNXSA+Jh9lP57+rF7UUVy46gDMADbaGrYbl2tzqgZYVy4i6+LS8L9mRyafjXJZednn1sl0a2CA
+stsuBKMpa6xctcWGM/tr7Tlx1qLW/zQw08FIg3/FZwIDAQABo0IwQDAdBgNVHQ4EFgQUEeBjpZP/
+NOTjMRcDKT3dHpLSAU8wHwYDVR0jBBgwFoAUEeBjpZP/NOTjMRcDKT3dHpLSAU8wDQYJKoZIhvcN
+AQELBQADggEBABeXkJ+ct5Hw5uCqZiQ3dTETQpZT/M3X0fZhc7YSWOFuSamfdxn7BR9K60pNGuhC
+XzZFGLsOZhh1OOOIxzRhXh46iq2+eQbG5ipw0ZG/23Iu4t8lOt8i+cGhD+8h36Tvl8sM4ISJcuW9
+vLv56ACZA8BLRcwSqcseQbCVFAUaGp6rEU/d9lNEJJimatZINTDxmXd0YeayXgKaJ/nzIdAR66OD
+OA9uZJcCONq4H80tG4Wyv1zy1NVJqXXrUpA2kOh4ohg6QhO7Gn7DY6omP9hs2SaEc+WCNaF/sWOH
+FqM4z0PPyDlL5pC7Qqq7GgU6EJnEHpc8CoD0mJi30LFC77tKuXo=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>