http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 28 insertions, 13 deletions

diff --git a/swamid-interfederations-2.0/www.rediris.es.xml b/swamid-interfederations-2.0/www.rediris.es.xml
index 34320c51..e572686b 100644
--- a/swamid-interfederations-2.0/www.rediris.es.xml
+++ b/swamid-interfederations-2.0/www.rediris.es.xml
@@ -1,33 +1,48 @@
 <?xml version="1.0"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/rediristestidp">
+  <md:Extensions>
+        <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+            <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+        </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  		<md:Extensions>
+            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+                <mdui:DisplayName xml:lang="en">RedIRIS Test IDP</mdui:DisplayName>
+                <mdui:DisplayName xml:lang="es">RedIRIS Test IDP</mdui:DisplayName>
+                <mdui:Description xml:lang="en">This is a test IdP run by RedIRIS</mdui:Description>
+                <mdui:Description xml:lang="es">Este es un IdP de pruebas operado por RedIRIS</mdui:Description>
+            </mdui:UIInfo>
+        </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIEpzCCA4+gAwIBAgIJAKu9NNxZYzTvMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzMB4XDTExMDYwODA5MTAwMVoXDTIxMDYwNzA5MTAwMVowgZMxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBAcTBk1hZHJpZDEQMA4GA1UEChMHUmVkSVJJUzETMBEGA1UECxMKTWlkZGxld2FyZTEbMBkGA1UEAxMSZWR1Z2Fpbi5yZWRpcmlzLmVzMR4wHAYJKoZIhvcNAQkBFg9zaXJpQHJlZGlyaXMuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaZm1UV2iTIb326tmnsaekltjP+5M9MoIUiLxIWOfLk6xK5+UeGnRlpSbVyIUS1afgRWprqAJ33iDimXBYnzWYKeM+DHktiAvTl9l6kh987g/rUCo6rZ0MrCdOu8GKqGmZNGo4/SNjRAFiMHj8CdM4N/e/5GCHDvS6YdsptoSHoanL5oYYx6nJUKXph8HLO3Sr/i/K9qIXek81X/zIsDNAkLj5wZeDt+TosoIOHzwUIpRrHVnvO/7Piu30ozu3fGOqRfHJIHDzJaNZCDBkzkkYCWD+39oVsbIwH4xSGhSsm5JuzCCL5QTzwbaJiUA/EfgV1Zzvv4bQjJmbBooHh8JAgMBAAGjgfswgfgwHQYDVR0OBBYEFKcD1MJGTvTWHgotuF7InFEAxve4MIHIBgNVHSMEgcAwgb2AFKcD1MJGTvTWHgotuF7InFEAxve4oYGZpIGWMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzggkAq7003FljNO8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYBRPKs5uhS4H6U8CHfYnZvz30s/64YoJlx688mZEfDKiYD2fcIeMaQ3b5ps9DAJlvc4Wx+2xrTrNfGqW7FVVJrL9ezRLUJox98fBlxB06de1K3J6fgqLKjKbcR5i1NjkFZYTBSs8Vn32SQoW36r9Yus5bO1XORUeEJAK3E4CWiEvqjE745PERA79V84JSWMqojqY5d66hJoGz0PvgP0TD7J+f+AH+Ot/vrJ21w8od/wob+MUM7mQMtsSb2Dbo1+XGLEIixU5ypiSl3vw/HNvUrIWzVD/eKvQyNbzWJu5/BIlwpqHoQXPkZFzap6KZFnYz747AG0EmZYL9xQR59Mk0w==</ds:X509Certificate>
+          <ds:X509Certificate>MIIEbTCCA1WgAwIBAgIQE4Nv+KfqJviO2JRRnaYt7TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDcxNTAwMDAwMFoXDTEzMDcxNDIzNTk1OVowSjELMAkGA1UEBhMCRVMxEDAOBgNVBAgTB1NldmlsbGExEDAOBgNVBAoTB1JlZElSSVMxFzAVBgNVBAMTDnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA09NWniyYzA2UzEiMuhBVVqD/h1D3BNUtzNj96DDA7QQneuRYH5lNP4FD0GU5rbiD7/ST9n9I6jCciHWnS7+3TuBzlGC+vBpi+84AW6Ln2Af8EKpuGVVS83CEZI50lTK3gKi+FXBdvVMg1mXozyaZYrOUHS/dhoSqQJaIsQFZpQ3OWTjQNtRl6VssWr9gyfuMn+DpcKVvdMPnNqUQfcKkSlXKBxujw2fZ+fa4LfQOzJm7jUAoSqSdYXBo+VuCGZwJbPgjihIAtZ27Q39qzp82nc6H49DIIGgjJJvgqA5rVT3LZmgGffl5njOHShPowlFFANkUHsdgRir/76yH1JNPyQIDAQABo4IBYTCCAV0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOCMtAbYU+Rsk/1RF0qEZqyPKy5KMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB3lJmqV0T3fbyLRhkSTr0PQFJlzwY3hlbwD0CGh7eRjktqW5r6B0JsvfSNvECReorH8PmkCawPi0HSqHLbppkmDENZEgB4rxWHjSHXKlr0HR4NEP8e569LlTfGSpoGAHZjGGnsdH2s5D6QtN4KcfmNhbzr/6gkqeq/5lxdGH3hcUP5Pnjtqy52+hdA5+V3pV9ZNa+oZtn+LHOTNgxb4B82HNXCpmY1+7y3ehzUoI4tEoIHtfhwkQxxI+Pe9PV9JTeFj+yf0Xx4bVYjNwARWfk0DGEF9FZpK+ouLf8g4CLYvIRfHmMjwpoyMpotrFhmxDRuZ4UnL7FVSwQgoaEYf3ZG</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIEpzCCA4+gAwIBAgIJAKu9NNxZYzTvMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzMB4XDTExMDYwODA5MTAwMVoXDTIxMDYwNzA5MTAwMVowgZMxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBAcTBk1hZHJpZDEQMA4GA1UEChMHUmVkSVJJUzETMBEGA1UECxMKTWlkZGxld2FyZTEbMBkGA1UEAxMSZWR1Z2Fpbi5yZWRpcmlzLmVzMR4wHAYJKoZIhvcNAQkBFg9zaXJpQHJlZGlyaXMuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaZm1UV2iTIb326tmnsaekltjP+5M9MoIUiLxIWOfLk6xK5+UeGnRlpSbVyIUS1afgRWprqAJ33iDimXBYnzWYKeM+DHktiAvTl9l6kh987g/rUCo6rZ0MrCdOu8GKqGmZNGo4/SNjRAFiMHj8CdM4N/e/5GCHDvS6YdsptoSHoanL5oYYx6nJUKXph8HLO3Sr/i/K9qIXek81X/zIsDNAkLj5wZeDt+TosoIOHzwUIpRrHVnvO/7Piu30ozu3fGOqRfHJIHDzJaNZCDBkzkkYCWD+39oVsbIwH4xSGhSsm5JuzCCL5QTzwbaJiUA/EfgV1Zzvv4bQjJmbBooHh8JAgMBAAGjgfswgfgwHQYDVR0OBBYEFKcD1MJGTvTWHgotuF7InFEAxve4MIHIBgNVHSMEgcAwgb2AFKcD1MJGTvTWHgotuF7InFEAxve4oYGZpIGWMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzggkAq7003FljNO8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYBRPKs5uhS4H6U8CHfYnZvz30s/64YoJlx688mZEfDKiYD2fcIeMaQ3b5ps9DAJlvc4Wx+2xrTrNfGqW7FVVJrL9ezRLUJox98fBlxB06de1K3J6fgqLKjKbcR5i1NjkFZYTBSs8Vn32SQoW36r9Yus5bO1XORUeEJAK3E4CWiEvqjE745PERA79V84JSWMqojqY5d66hJoGz0PvgP0TD7J+f+AH+Ot/vrJ21w8od/wob+MUM7mQMtsSb2Dbo1+XGLEIixU5ypiSl3vw/HNvUrIWzVD/eKvQyNbzWJu5/BIlwpqHoQXPkZFzap6KZFnYz747AG0EmZYL9xQR59Mk0w==</ds:X509Certificate>
+          <ds:X509Certificate>MIIEbTCCA1WgAwIBAgIQE4Nv+KfqJviO2JRRnaYt7TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDcxNTAwMDAwMFoXDTEzMDcxNDIzNTk1OVowSjELMAkGA1UEBhMCRVMxEDAOBgNVBAgTB1NldmlsbGExEDAOBgNVBAoTB1JlZElSSVMxFzAVBgNVBAMTDnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA09NWniyYzA2UzEiMuhBVVqD/h1D3BNUtzNj96DDA7QQneuRYH5lNP4FD0GU5rbiD7/ST9n9I6jCciHWnS7+3TuBzlGC+vBpi+84AW6Ln2Af8EKpuGVVS83CEZI50lTK3gKi+FXBdvVMg1mXozyaZYrOUHS/dhoSqQJaIsQFZpQ3OWTjQNtRl6VssWr9gyfuMn+DpcKVvdMPnNqUQfcKkSlXKBxujw2fZ+fa4LfQOzJm7jUAoSqSdYXBo+VuCGZwJbPgjihIAtZ27Q39qzp82nc6H49DIIGgjJJvgqA5rVT3LZmgGffl5njOHShPowlFFANkUHsdgRir/76yH1JNPyQIDAQABo4IBYTCCAV0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOCMtAbYU+Rsk/1RF0qEZqyPKy5KMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB3lJmqV0T3fbyLRhkSTr0PQFJlzwY3hlbwD0CGh7eRjktqW5r6B0JsvfSNvECReorH8PmkCawPi0HSqHLbppkmDENZEgB4rxWHjSHXKlr0HR4NEP8e569LlTfGSpoGAHZjGGnsdH2s5D6QtN4KcfmNhbzr/6gkqeq/5lxdGH3hcUP5Pnjtqy52+hdA5+V3pV9ZNa+oZtn+LHOTNgxb4B82HNXCpmY1+7y3ehzUoI4tEoIHtfhwkQxxI+Pe9PV9JTeFj+yf0Xx4bVYjNwARWfk0DGEF9FZpK+ouLf8g4CLYvIRfHmMjwpoyMpotrFhmxDRuZ4UnL7FVSwQgoaEYf3ZG</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
     <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="http://sir.rediris.es/simplesamlphp/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
+  
   <md:Organization>
-    <md:OrganizationName xml:lang="es">Red Académica y de Investigación Española</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">RedIRIS - Spanish National Research and Education Network</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RedIRIS Test</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rediris.es</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Antonio David</md:GivenName>
-    <md:SurName>Perez Morales</md:SurName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
+       	<md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
+       	<md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
+       	<md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
+       	<md:OrganizationDisplayName xml:lang="es">RedIRIS</md:OrganizationDisplayName>
+       	<md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+       	<md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+   	</md:Organization>
+   	<md:ContactPerson contactType="technical">
+       	<md:GivenName>SIR helpdesk</md:GivenName>
+       	<md:EmailAddress>sir@rediris.es</md:EmailAddress>
+   	</md:ContactPerson>
 </md:EntityDescriptor>