1 files changed, 118 insertions, 70 deletions
diff --git a/swamid-interfederations-2.0/idp.rnp.br.xml b/swamid-interfederations-2.0/idp.rnp.br.xml
index b69db26a..acb85b1b 100644
--- a/swamid-interfederations-2.0/idp.rnp.br.xml
+++ b/swamid-interfederations-2.0/idp.rnp.br.xml
@@ -1,72 +1,120 @@
 <?xml version="1.0"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.rnp.br/idp/shibboleth">
-<Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2009-12-08T00:00:00Z">
-<mdrpi:RegistrationPolicy xml:lang="pt-br">http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</Extensions>
-<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-<Extensions>
-<shibmd:Scope regexp="false">rnp.br</shibmd:Scope>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-  <mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
-  <mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
-  <mdui:Description xml:lang="en">Rede Nacional de Ensino e Pesquisa</mdui:Description>
-  <mdui:Description xml:lang="pt-br">Rede Nacional de Ensino e Pesquisa</mdui:Description>
-  <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br/</mdui:InformationURL>
-  <mdui:InformationURL xml:lang="en">http://www.rnp.br/</mdui:InformationURL>
-  </mdui:UIInfo>
-</Extensions>
-<KeyDescriptor>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDQ1BEMQswCQYD VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMDEyMDcxNzU1NDFaFw0x MzEyMDYxNzU1NDFaMDAxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxEzARBgNV BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd YhNuKYwkqB7NUKrK2xv4yRKURtfFtEUMs8HyIM0MF6rtmN61YNi3t2CehOFqjI8q BWf63iuSbGSnjoIwZsCUvu7v8++t0qtcqJkhU4XC5pu/t0OKV8EsywfHTDVXHCAC Lh2LE1FkdHQ6qxpjiL3HJj6Ar+AANXA60JYKsDgG5wZAjsTbMAvo5r9ZCNBqLbna hduyk8Nb6lBmoibx3UjADQTaOMs+Foy1HzrlYHoeL9efToJg1KU7d4toCSUf1sDi CjC7CLXbF4VvrE+6ebS3kZF8AoaBFsevUsdIt47Fc8oWy4QAv0YNAwgVOmbAbxLs CSNzoY+9Lx4LYCUgf5nlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAF2n7e/YVBjm o6TxoOPr5BqJE6I6xZBbyTRHgspcRhW4lGG2zJJg4xNwEmFx9YYq/jRg3mrQu1lE bZxNdYmPQCo/yTfYNv8/PIzbgVvIw8jIgNjeqGpKaejDQ032AGpRK7r/4p3sNyaw ULAmkQaCy3W9bh5t/m3149Id4MX+I5Evl4IGqIsOLWI/qfbwjUJNcr9srRZCObOt ERz92TVogiPgOoo8qcVeR2hgEihbLtAnwp37xoVVIeRGR/aGYyeFfFwMTrx0Oi5I SuwSzqy1/UEHDn79fCGPinLX3Jtq7mrUIukE7KT69xnbA/HEQ12OED9w4973L/uP OxeHptP2z6w=
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-<NameIDFormat>
-urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-</NameIDFormat>
-<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rnp.br/idp/profile/Shibboleth/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rnp.br/idp/profile/SAML2/POST/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rnp.br/idp/profile/SAML2/Redirect/SSO"/>
-</IDPSSODescriptor>
-<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-<Extensions>
-<shibmd:Scope regexp="false">rnp.br</shibmd:Scope>
-</Extensions>
-<KeyDescriptor>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDQ1BEMQswCQYD VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMDEyMDcxNzU1NDFaFw0x MzEyMDYxNzU1NDFaMDAxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxEzARBgNV BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd YhNuKYwkqB7NUKrK2xv4yRKURtfFtEUMs8HyIM0MF6rtmN61YNi3t2CehOFqjI8q BWf63iuSbGSnjoIwZsCUvu7v8++t0qtcqJkhU4XC5pu/t0OKV8EsywfHTDVXHCAC Lh2LE1FkdHQ6qxpjiL3HJj6Ar+AANXA60JYKsDgG5wZAjsTbMAvo5r9ZCNBqLbna hduyk8Nb6lBmoibx3UjADQTaOMs+Foy1HzrlYHoeL9efToJg1KU7d4toCSUf1sDi CjC7CLXbF4VvrE+6ebS3kZF8AoaBFsevUsdIt47Fc8oWy4QAv0YNAwgVOmbAbxLs CSNzoY+9Lx4LYCUgf5nlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAF2n7e/YVBjm o6TxoOPr5BqJE6I6xZBbyTRHgspcRhW4lGG2zJJg4xNwEmFx9YYq/jRg3mrQu1lE bZxNdYmPQCo/yTfYNv8/PIzbgVvIw8jIgNjeqGpKaejDQ032AGpRK7r/4p3sNyaw ULAmkQaCy3W9bh5t/m3149Id4MX+I5Evl4IGqIsOLWI/qfbwjUJNcr9srRZCObOt ERz92TVogiPgOoo8qcVeR2hgEihbLtAnwp37xoVVIeRGR/aGYyeFfFwMTrx0Oi5I SuwSzqy1/UEHDn79fCGPinLX3Jtq7mrUIukE7KT69xnbA/HEQ12OED9w4973L/uP OxeHptP2z6w=
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-<NameIDFormat>
-urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-</NameIDFormat>
-</AttributeAuthorityDescriptor>
-<Organization>
-<OrganizationName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
-<OrganizationName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
-<OrganizationDisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
-<OrganizationDisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
-<OrganizationURL xml:lang="en">http://www.rnp.br/</OrganizationURL>
-<OrganizationURL xml:lang="pt-br">http://www.rnp.br/</OrganizationURL>
-</Organization>
-<ContactPerson contactType="technical">
-<SurName>GTI/RNP</SurName>
-<EmailAddress>servnac@rnp.br</EmailAddress>
-</ContactPerson>
-</EntityDescriptor>
+    <Extensions>
+
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+                              <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </Extensions>
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <Extensions>
+        <shibmd:Scope regexp="false">rnp.br</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
+          <mdui:Description xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
+          <mdui:Description xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
+          <mdui:InformationURL xml:lang="en">http://www.rnp.br/</mdui:InformationURL>
+          <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br/</mdui:InformationURL>
+        </mdui:UIInfo>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo>
+          <ds:X509Data>
+            <ds:X509Certificate>
+    MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMDEyMDcxNzU1NDFaFw0x
+MzEyMDYxNzU1NDFaMDAxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxEzARBgNV
+BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd
+YhNuKYwkqB7NUKrK2xv4yRKURtfFtEUMs8HyIM0MF6rtmN61YNi3t2CehOFqjI8q
+BWf63iuSbGSnjoIwZsCUvu7v8++t0qtcqJkhU4XC5pu/t0OKV8EsywfHTDVXHCAC
+Lh2LE1FkdHQ6qxpjiL3HJj6Ar+AANXA60JYKsDgG5wZAjsTbMAvo5r9ZCNBqLbna
+hduyk8Nb6lBmoibx3UjADQTaOMs+Foy1HzrlYHoeL9efToJg1KU7d4toCSUf1sDi
+CjC7CLXbF4VvrE+6ebS3kZF8AoaBFsevUsdIt47Fc8oWy4QAv0YNAwgVOmbAbxLs
+CSNzoY+9Lx4LYCUgf5nlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAF2n7e/YVBjm
+o6TxoOPr5BqJE6I6xZBbyTRHgspcRhW4lGG2zJJg4xNwEmFx9YYq/jRg3mrQu1lE
+bZxNdYmPQCo/yTfYNv8/PIzbgVvIw8jIgNjeqGpKaejDQ032AGpRK7r/4p3sNyaw
+ULAmkQaCy3W9bh5t/m3149Id4MX+I5Evl4IGqIsOLWI/qfbwjUJNcr9srRZCObOt
+ERz92TVogiPgOoo8qcVeR2hgEihbLtAnwp37xoVVIeRGR/aGYyeFfFwMTrx0Oi5I
+SuwSzqy1/UEHDn79fCGPinLX3Jtq7mrUIukE7KT69xnbA/HEQ12OED9w4973L/uP
+OxeHptP2z6w=
+            </ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rnp.br/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rnp.br/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rnp.br/idp/profile/SAML2/Redirect/SSO"/>
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+      <Extensions>
+        <shibmd:Scope regexp="false">rnp.br</shibmd:Scope>
+      </Extensions>
+
+      <KeyDescriptor>
+        <ds:KeyInfo>
+          <ds:X509Data>
+            <ds:X509Certificate>
+      
+MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMDEyMDcxNzU1NDFaFw0x
+MzEyMDYxNzU1NDFaMDAxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxEzARBgNV
+BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd
+YhNuKYwkqB7NUKrK2xv4yRKURtfFtEUMs8HyIM0MF6rtmN61YNi3t2CehOFqjI8q
+BWf63iuSbGSnjoIwZsCUvu7v8++t0qtcqJkhU4XC5pu/t0OKV8EsywfHTDVXHCAC
+Lh2LE1FkdHQ6qxpjiL3HJj6Ar+AANXA60JYKsDgG5wZAjsTbMAvo5r9ZCNBqLbna
+hduyk8Nb6lBmoibx3UjADQTaOMs+Foy1HzrlYHoeL9efToJg1KU7d4toCSUf1sDi
+CjC7CLXbF4VvrE+6ebS3kZF8AoaBFsevUsdIt47Fc8oWy4QAv0YNAwgVOmbAbxLs
+CSNzoY+9Lx4LYCUgf5nlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAF2n7e/YVBjm
+o6TxoOPr5BqJE6I6xZBbyTRHgspcRhW4lGG2zJJg4xNwEmFx9YYq/jRg3mrQu1lE
+bZxNdYmPQCo/yTfYNv8/PIzbgVvIw8jIgNjeqGpKaejDQ032AGpRK7r/4p3sNyaw
+ULAmkQaCy3W9bh5t/m3149Id4MX+I5Evl4IGqIsOLWI/qfbwjUJNcr9srRZCObOt
+ERz92TVogiPgOoo8qcVeR2hgEihbLtAnwp37xoVVIeRGR/aGYyeFfFwMTrx0Oi5I
+SuwSzqy1/UEHDn79fCGPinLX3Jtq7mrUIukE7KT69xnbA/HEQ12OED9w4973L/uP
+OxeHptP2z6w=
+                    
+            </ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+    </AttributeAuthorityDescriptor>
+
+    <Organization>
+      <OrganizationName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
+      <OrganizationName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
+      <OrganizationDisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
+      <OrganizationDisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
+      <OrganizationURL xml:lang="en">http://www.rnp.br/</OrganizationURL>
+      <OrganizationURL xml:lang="pt-br">http://www.rnp.br/</OrganizationURL>
+    </Organization>
+
+    <ContactPerson contactType="technical">
+      <SurName>GTI/RNP</SurName>
+      <EmailAddress>servnac@rnp.br</EmailAddress>
+    </ContactPerson>
+
+  </EntityDescriptor>