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

1 files changed, 29 insertions, 25 deletions

diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
index a7010fe3..63d6ae17 100644
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-01-27T18:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
+  </md:Extensions>
   <md: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">
     <md:Extensions>
       <mdui:UIInfo>
@@ -20,38 +19,43 @@
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>serviziweb.unito.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=serviziweb.unito.it,O=Universit\C3\A0 degli Studi di Torino,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEgDCCA2igAwIBAgIRAI23y9ITrv6V83fVgnk6IS0wDQYJKoZIhvcNAQEFBQAw
+          <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAJ1SDn1K6/XkRV070chIBJswDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMDA5MjAwMDAwMDBaFw0xMzA5MTkyMzU5NTlaMFcxCzAJBgNV
+                            IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMFcxCzAJBgNV
                             BAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jp
                             bm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEB
-                            AQUAA4IBDwAwggEKAoIBAQDYkhN1NRqrtcwJFbOnfXDkQ2jt2W6RKLlu92y32YOa
-                            6tpdTt/79tKgwu/LBKsxfkDqpgSUCvDF6nMZtRXT+slDvLSTDNDlmR5qZNfvX2NJ
-                            EKyoUmkx/dwUiBdQStRI6xyRqFYOYUBMzazcNwmDBsHP95ehvPNm7Elizy+1q+NB
-                            c81vhwn0d3pDjTss3XwTKupzMvIvFD+IumMPLNXwGM6xoIpQDcs5xgZixepu5c0w
-                            CxcDraqezCn8Wf+ZcIGnEPAW95lRvZzRmEAKzvbay/5kLdq0ZhCqFMNaKtU0nNjF
-                            2RnoYeRA2Xpl4hj8vKzfN8cCjZP7ZA8so0y0nzZjtL8hAgMBAAGjggFmMIIBYjAf
-                            BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8PHbME7x
-                            lHVkY1LYPThdV2ejntAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+                            AQUAA4IBDwAwggEKAoIBAQCkR8/1ia78SrXo2BUwW/x7MFZoWhndhTrxa9RN6LLr
+                            RpLYZOZcH6nByQphxTfVOSkDLs3WJeFc2K7gCRqkpqlPTAm9OeE6Wcno6hhNjxY5
+                            NxWHm53FqUT4WF0Gq9XchBduW1xYJqJMHJW9seehiwaBgdhIewpHKyABf02yE3El
+                            nUmcVVJ7lujPxhn+iqts36Zv4cPQlhu1aMsFfep1DPqY3xo/bn4wM6ikKZpyVBZL
+                            4BVQn6WxHdflUXS7jjvkRXccz5Fb002jZP2ciyNDqZrLvc+ykRTaGbfv2+CD+1ik
+                            pCl5eVA8sM9j7OoD2qo0Hwqg72xdcZsXixxR9kItAKhlAgMBAAGjggF/MIIBezAf
+                            BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU/kRemvBq
+                            DKxXn7Lf1JA5x4cQGEswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
                             VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
                             MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
                             Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
                             dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-                            BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITc2Vy
-                            dml6aXdlYi51bml0by5pdDANBgkqhkiG9w0BAQUFAAOCAQEAhWmFJToQzrYj/Uwl
-                            qs/clWgOURj7pNLtlJiL21XLjwBSAoO6Ox4V5T6xwTpOnueYctmNFdK7I8j1u/1y
-                            DQwWk81sztxj9F8NKpY1OdVq8hRQ0H4LFfJ7hhc4xVkWobFZfIfyyJtfrk9DTaV4
-                            Xq/lyNvgH9Ged1GPDmLaqzvEZW30ZPqL9mULnEDDIoLmnD5WfsumO2UlN6Q+lMWC
-                            lHN+wFATPaPZvPYt12ps5OumiSpZ42FgdQMPEOeFkYNt0/87ez/c9wyI+pD1NFQw
-                            +cdP6e+25hKx4NUoRUr+Q8SaOLJ2xYDrs4nWjZFn5TLknCwU8ljoVGjzbyg+KaLh
-                            HU+UDg==
+                            BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwNwYDVR0RBDAwLoITc2Vy
+                            dml6aXdlYi51bml0by5pdIIXd3d3LnNlcnZpeml3ZWIudW5pdG8uaXQwDQYJKoZI
+                            hvcNAQEFBQADggEBADuNAc7xfGwb6H7Z5InKCocT/KqAD0as8oc7vjzLTIWKbrt/
+                            RZQ7QuFHuE6obQ7AhVUYaqWNqCTzErUvabGAYl8oe0tAPNiKSZ+GxLt4OkNacdE+
+                            FoYBP+DAB8H/BaZhUicXRJDxhxjxrGvqpvUl6BzK5aZEsK+un1ID4lBfb3CFHpQW
+                            4fX5uvhpk6cgXniW7oK6iUypnQisJQZsCXbCnoxVSGt1dvz3HeN1+54uYUyKcmp6
+                            wDTCNv5dHkAAUyiItyHFctIOgWocjGH+LYNfnSZChgF49Tjj0o+j/av6yu26pQvj
+                            BUULpqM3xZG1Zi261ZLtbXQz0AKsk7OnPBSDDI0=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgDCCA2igAwIBAgIRAI23y9ITrv6V83fVgnk6IS0wDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDA5MjAwMDAwMDBaFw0xMzA5MTkyMzU5NTlaMFcxCzAJBgNVBAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jpbm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYkhN1NRqrtcwJFbOnfXDkQ2jt2W6RKLlu92y32YOa6tpdTt/79tKgwu/LBKsxfkDqpgSUCvDF6nMZtRXT+slDvLSTDNDlmR5qZNfvX2NJEKyoUmkx/dwUiBdQStRI6xyRqFYOYUBMzazcNwmDBsHP95ehvPNm7Elizy+1q+NBc81vhwn0d3pDjTss3XwTKupzMvIvFD+IumMPLNXwGM6xoIpQDcs5xgZixepu5c0wCxcDraqezCn8Wf+ZcIGnEPAW95lRvZzRmEAKzvbay/5kLdq0ZhCqFMNaKtU0nNjF2RnoYeRA2Xpl4hj8vKzfN8cCjZP7ZA8so0y0nzZjtL8hAgMBAAGjggFmMIIBYjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8PHbME7xlHVkY1LYPThdV2ejntAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITc2Vydml6aXdlYi51bml0by5pdDANBgkqhkiG9w0BAQUFAAOCAQEAhWmFJToQzrYj/Uwlqs/clWgOURj7pNLtlJiL21XLjwBSAoO6Ox4V5T6xwTpOnueYctmNFdK7I8j1u/1yDQwWk81sztxj9F8NKpY1OdVq8hRQ0H4LFfJ7hhc4xVkWobFZfIfyyJtfrk9DTaV4Xq/lyNvgH9Ged1GPDmLaqzvEZW30ZPqL9mULnEDDIoLmnD5WfsumO2UlN6Q+lMWClHN+wFATPaPZvPYt12ps5OumiSpZ42FgdQMPEOeFkYNt0/87ez/c9wyI+pD1NFQw+cdP6e+25hKx4NUoRUr+Q8SaOLJ2xYDrs4nWjZFn5TLknCwU8ljoVGjzbyg+KaLhHU+UDg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>