--- ACOnet/https%3A%2F%2Fufal-point.mff.cuni.cz%2Fshibboleth%2Feduid%2Fsp.xml
+++ CLARIN IdP/https%3A%2F%2Fufal-point.mff.cuni.cz%2Fshibboleth%2Feduid%2Fsp.xml
@@ -1,41 +1,71 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:54:59Z">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</RegistrationPolicy>
-      <RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</RegistrationPolicy>
-    </RegistrationInfo>
     <EntityAttributes xmlns="urn:oasis:names:tc:SAML:metadata:attribute">
       <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
         <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
         <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
+        <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
       </Attribute>
     </EntityAttributes>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
   </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <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://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="cs">Repozitář a služby LINDAT/CLARIN</DisplayName>
         <DisplayName xml:lang="de">LINDAT / CLARIN Dienste</DisplayName>
         <DisplayName xml:lang="en">LINDAT/CLARIN services</DisplayName>
+        <DisplayName xml:lang="fi">LINDAT / CLARIN palvelut</DisplayName>
+        <Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka</Description>
         <Description xml:lang="de">LINDAT / CLARIN Digitales Langzeitarchiv und Dienste für die Sprachforschungsinfrastruktur</Description>
         <Description xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</Description>
-        <Logo height="16" width="16">https://lindat.mff.cuni.cz/favicon.ico</Logo>
-        <InformationURL xml:lang="de">http://ufal.mff.cuni.cz/</InformationURL>
+        <Description xml:lang="fi">LINDAT / CLARIN digitaalinen arkisto ja palvelut kielelliseen tutkimusinfrastruktuurin</Description>
+        <DisplayName xml:lang="da">CLARIN-DK-UCPH</DisplayName>
         <InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</InformationURL>
+        <InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</PrivacyStatementURL>
+        <Logo height="29" width="29">https://lindat.mff.cuni.cz/favicon.ico</Logo>
       </UIInfo>
+      <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login"/>
+      <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://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="1"/>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <KeyName>Active</KeyName>
         <KeyName>lindat.mff.cuni.cz</KeyName>
+        <KeyName>ufal-point.mff.cuni.cz</KeyName>
         <X509Data>
           <X509SubjectName>CN=lindat.mff.cuni.cz,O=Charles University in Prague,L=Praha 1,C=CZ</X509SubjectName>
           <X509Certificate>MIIFNjCCBB6gAwIBAgIQDWW2Dr7MgrU3STou4By7YDANBgkqhkiG9w0BAQsFADBk MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg Q0EgMzAeFw0xNTEyMTgwMDAwMDBaFw0xOTAxMDQxMjAwMDBaMGMxCzAJBgNVBAYT AkNaMRAwDgYDVQQHEwdQcmFoYSAxMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNp dHkgaW4gUHJhZ3VlMRswGQYDVQQDExJsaW5kYXQubWZmLmN1bmkuY3owggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD+Bn2MB6kISGLTZsipc/aScdKbsrKg 9n/M1XmOYhcim5Z9cYsvKdYmz7NRqj84Zw3+PePYQKHkXh+wHcsuHsLvzWdQCUKw Rlbx+On0JBt2H4pi//hbG3HKApjEo9dgBOT4siIS0wr1YE2uI4DJHwpJUEaVR8fh U8Meq1SEyFuv1Ms7WMnSyCrBEEYTwQvgcoip1D3lcCPIcNu18Ruxk2b1MNZJ0GwB o2cxoh7zZIdED2rto9eE6LCWFnaQsnSg0O2IBvbG/fHYM7chR3Yij34wTRSE+3jx x6jQeUrVh87Ipx6ci5rBHDQCc27Jdtq7y+qF7hA2S8El4/O5XT3QjRFRAgMBAAGj ggHjMIIB3zAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4E FgQUJKDyWJPPFFVPHDXZPi33vKtyAnswNQYDVR0RBC4wLIISbGluZGF0Lm1mZi5j dW5pLmN6ghZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MA4GA1UdDwEB/wQEAwIFoDAd BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYDVR0fBGQwYjAvoC2gK4Yp aHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwL6AtoCuG KWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMEwGA1Ud IARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRp Z2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEF BQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRw Oi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMB Af8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCwlL6xMv9lUqkBtG90gNqsLlI98I/t S5un5NDV/2enYSDH96/TGbwRbw8l9YWY7JYgP6adoRg4ic+qdW8sk+hVhWZ+iYRn fryN2ITonIWj0A/FxeMpBBiuElbkayGi1rYsmJhUJ3IPNu4GTxSQ6UoL0LV/udva sWKEt3mLdsHyM0IH4B5S7/lrBsw7/EtQWC+6+o+8+iNRMxvQlw0GEazq8cuA83Hl bpOzpXInsFHyabbqV4cygIebofCd+uXcYQC+EAmfWKKp/FtJtnClMudLGbqeQreY zD0BnQ6nkrkTHDGYMB1yU5EgC6dHRI3Jf5fKRqrTDvvYkWyUtmY41AeM</X509Certificate>
         </X509Data>
       </KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
@@ -44,7 +74,6 @@
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
@@ -53,40 +82,44 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">LINDAT / CLARIN Dienste</ServiceName>
-      <ServiceName xml:lang="en">LINDAT/CLARIN services</ServiceName>
-      <ServiceDescription xml:lang="de">LINDAT / CLARIN Digitales Langzeitarchiv und Dienste für die Sprachforschungsinfrastruktur</ServiceDescription>
-      <ServiceDescription xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</ServiceDescription>
+      <ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</ServiceName>
+      <ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="de">e459</OrganizationName>
-    <OrganizationName xml:lang="en">e459</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://clarin.eu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
+    <OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Jozef</GivenName>
-    <SurName>Mišutka</SurName>
-    <EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</EmailAddress>
+  <ContactPerson contactType="technical">
+    <GivenName>Pavel</GivenName>
+    <SurName>Straňák</SurName>
+    <EmailAddress>mailto:stranak@ufal.mff.cuni.cz</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Jozef</GivenName>
     <SurName>Mišutka</SurName>
     <EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pavel</GivenName>
-    <SurName>Straňák</SurName>
-    <EmailAddress>mailto:stranak@ufal.mff.cuni.cz</EmailAddress>
+  <ContactPerson contactType="administrative">
+    <GivenName>Jozef</GivenName>
+    <SurName>Mišutka</SurName>
+    <EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>