--- eduID.cz/https%3A%2F%2Fdspace-clarin-it.ilc.cnr.it%2FShibboleth.sso%2FMetadata.xml
+++ CLARIN IdP/https%3A%2F%2Fdspace-clarin-it.ilc.cnr.it%2FShibboleth.sso%2FMetadata.xml
@@ -1,46 +1,74 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/Metadata">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-06-14T11:49:06Z">
-      <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>
       </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 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>
+      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">Digital Repository for the CLARIN Research Infrastructure provided by ILC-CNR</DisplayName>
+        <DisplayName xml:lang="it">Repository Digitale per la Infrastruttura di Ricerca CLARIN erogato da ILC-CNR</DisplayName>
+        <Description xml:lang="en">ILC-CNR for CLARIN-IT Consortium: Digital repository and services on language research infrastructure</Description>
+        <Description xml:lang="it">ILC-CNR per il consorzio CLARIN-IT: repository e servizi di risorse linguistiche</Description>
+        <InformationURL xml:lang="en">https://dspace-clarin-it.ilc.cnr.it/repository/xmlui/page/about</InformationURL>
+        <InformationURL xml:lang="it">https://dspace-clarin-it.ilc.cnr.it/repository/xmlui/page/about</InformationURL>
+        <Logo height="68" width="453" xml:lang="en">https://webmail.ilc.cnr.it/CLARIN-IT_ILC_Logo_453x68.png</Logo>
+        <Logo height="68" width="453" xml:lang="it">https://webmail.ilc.cnr.it/CLARIN-IT_ILC_Logo_453x68.png</Logo>
+        <Logo height="16" width="16" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</Logo>
+        <Logo height="16" width="16" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</Logo>
+        <Logo height="80" width="60" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</Logo>
+        <Logo height="80" width="60" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</Logo>
+        <PrivacyStatementURL xml:lang="en">https://dspace-clarin-it.ilc.cnr.it/repository/xmlui/page/privacypolicy</PrivacyStatementURL>
+        <PrivacyStatementURL xml:lang="it">https://dspace-clarin-it.ilc.cnr.it/repository/xmlui/page/privacypolicy</PrivacyStatementURL>
+      </UIInfo>
+      <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dspace-clarin-it.ilc.cnr.it/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://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">Digital Repository for the CLARIN Research Infrastructure provided by ILC-CNR</DisplayName>
-        <DisplayName xml:lang="en">Digital Repository for the CLARIN Research Infrastructure provided by ILC-CNR</DisplayName>
-        <Description xml:lang="de">ILC-CNR for CLARIN-IT Consortium: Digital repository and services on language research infrastructure</Description>
-        <Description xml:lang="en">ILC-CNR for CLARIN-IT Consortium: Digital repository and services on language research infrastructure</Description>
-        <Logo height="100" width="100">https://dspace-clarin-it.ilc.cnr.it/repository/xmlui/themes/UFAL/images/lindat/ILC-CNR_for_CLARIN-IT_Logo.png</Logo>
-        <InformationURL xml:lang="en">https://dspace-clarin-it.ilc.cnr.it/repository/xmlui/page/about</InformationURL>
-        <PrivacyStatementURL xml:lang="en">https://dspace-clarin-it.ilc.cnr.it/repository/xmlui/page/privacypolicy</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <KeyName>dspace-clarin-it.ilc.cnr.it</KeyName>
         <X509Data>
-          <X509SubjectName>CN=dspace-clarin-it.ilc.cnr.it,OU=Istituto di Linguistica Computazionale,O=Consiglio Nazionale delle Ricerche,L=Roma,C=IT</X509SubjectName>
+          <X509SubjectName>CN=dspace-clarin-it.ilc.cnr.it,OU=Istituto di Linguistica Computazionale,O=Consiglio Nazionale delle Ricerche,L=Roma,ST=Roma,C=IT</X509SubjectName>
           <X509Certificate>MIIHXzCCBkegAwIBAgIQCv8k1uX2Gzc/2foln7jdKzANBgkqhkiG9w0BAQsFADBk MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg Q0EgMzAeFw0xODEwMjMwMDAwMDBaFw0yMTAxMjUwMDAwMDBaMIGgMQswCQYDVQQG EwJJVDENMAsGA1UEBxMEUm9tYTErMCkGA1UEChMiQ29uc2lnbGlvIE5hemlvbmFs ZSBkZWxsZSBSaWNlcmNoZTEvMC0GA1UECxMmSXN0aXR1dG8gZGkgTGluZ3Vpc3Rp Y2EgQ29tcHV0YXppb25hbGUxJDAiBgNVBAMTG2RzcGFjZS1jbGFyaW4taXQuaWxj LmNuci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM0+sErKU5Ko jNL1Hn4Q1tK0iutJiieqvjWU+9tbutdT1Ssi5FXu3gwe6vNWvPl3Y0jaKm9L1nut yitsNXSkLtaew4hkD5mPrCCEV1DjCLzL6B/0g8jzsoAJo0kPcOtHEpkjdJBkQMIa TguSSRu3sx6DPLmZUZDOSSjIByXPyekQIc7m2Llh2YGFzR+NOKBy1uKI9wD8joV1 YwvGk+5xc64HqQa6zAzJRisDTi7egIbxIcKKpRa5t0jnKG2p6Zt9nAd5ubGGMkrp vMYJaG21xMdd1QieubPx0KkuQ7lYfd5RVCsEF1R3qsA4VJjcthcVzgy8ZBxdwgBx if+0JaHi8aUCAwEAAaOCA84wggPKMB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvp URFjdVBiMB0GA1UdDgQWBBRN6Mm/dTvB1EYrHpth20pfp5gsxzAmBgNVHREEHzAd ghtkc3BhY2UtY2xhcmluLWl0LmlsYy5jbnIuaXQwDgYDVR0PAQH/BAQDAgWgMB0G A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilo dHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4Yp aHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0g BEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGln aWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUF BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6 Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB /wQCMAAwggH2BgorBgEEAdZ5AgQCBIIB5gSCAeIB4AB2AKS5CZC0GFgUh7sTosxn cAo8NZgE+RvfuON3zQ7IDdwQAAABZqBRfocAAAQDAEcwRQIgIx+cW2CJd7Xsw9zd yhBPjePJShe7DOayKI0QnhzbChQCIQCSQaNSBomdgctctFF1A5JVfiajlxBT5QZ9 gdL4wrvlrgB2AId1v+dZfPiMQ5lfvfNu/1aNR1Y2/0q1YMG06v9eoIMPAAABZqBR f3oAAAQDAEcwRQIgXgvi57YYwXhQ4wQBd4Q2uXB7o7UlGmvutwAn7G7PY3QCIQCR qDgGPHA1AHQQRL/9UD4jLflkhsjPOyYlN/KsuEDZcwB2ALvZ37wfinG1k5Qjl6qS e0c4V5UKq1LoGpCWZDaOHtGFAAABZqBRfroAAAQDAEcwRQIhAJAmbDOsAEHObQ+o YH/x2s/BdvuQl7Zbou4WwGwkOFQIAiBc4WvFUEQUviX5Pr4y8XXtSE25uULJrqjD n36Ms3guXwB2AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kTAAABZqBR f/QAAAQDAEcwRQIgbYoFgzOPqhpG8vxleSBgq1d0G9YZuCdOn9TWjA4/n5ICIQDZ XKeZ+df7s1lOOjKzrM13+bsrZFAAc4IN3NMEGRDdrjANBgkqhkiG9w0BAQsFAAOC AQEAeWzsLbRIlwA6w7kkQvtapaaVH9gsG0Th7IRoQV9icHIqea6Kwt998ubSQnVU B0YvO0EUDkAkmT1Y0EWZTV4OVnK+iH/Dxyj1wtFKP6/rwvLXKEidQST24Y7GQWIo hAtUkhfU7wax/7zYv5Tcmk4KDUwKaCyX3MuLlKDCcKriatRskviim3HTYVDlECCu 9CQWtk/la7LH1W3HaKNXRHTjC3i/k3FfnY0tSX8qCloRF1KIUWXjTpw9COPxsS9Z 7ELSyY+8Of7LRQRI5K2pLLdHdxokeeLucl+0V0ItPfQz25OKNvesu/+c6dE6bTTL vMsMaOnszi5e8qaf5cbVOu23fQ==</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://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SLO/Artifact"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SLO/Redirect"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SLO/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
@@ -48,13 +76,15 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SAML/POST" index="5"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dspace-clarin-it.ilc.cnr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Digital Repository for the CLARIN Research Infrastructure provided by ILC-CNR</ServiceName>
       <ServiceName xml:lang="en">Digital Repository for the CLARIN Research Infrastructure provided by ILC-CNR</ServiceName>
-      <ServiceDescription xml:lang="de">ILC-CNR for CLARIN-IT Consortium: Digital repository and services on language research infrastructure</ServiceDescription>
-      <ServiceDescription xml:lang="en">ILC-CNR for CLARIN-IT Consortium: Digital repository and services on language research infrastructure</ServiceDescription>
+      <ServiceName xml:lang="it">Repository Digitale per la Infrastruttura di Ricerca CLARIN erogato da ILC-CNR</ServiceName>
+      <ServiceDescription xml:lang="en">Digital Repository and services related to the CLARIN-IT consortium under the CLARIN Research Infrastructure; focused in the field of Computational Linguistics, it's provided by Institute for Computational Linguistics "Antonio Zampolli", National Research Council, located in Pisa</ServiceDescription>
+      <ServiceDescription xml:lang="it">Repository Digitale e servizi relativi al consorzio CLARIN-IT sotto l'Infrastruttura di Ricerca CLARIN; focalizzato nel campo della Linguistica Computazionale, e' fornito dall'Istituto di Linguistica Computazionale "Antonio Zampolli", Consiglio Nazionale delle Ricerche, con sede a Pisa</ServiceDescription>
       <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="email" 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:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <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"/>
@@ -62,12 +92,12 @@
     </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">National Research Council (CNR)</OrganizationName>
+    <OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ilc.cnr.it/en</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.ilc.cnr.it</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Riccardo</GivenName>