resolve conflicts and merge

1 files changed, 56 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..de708f72
--- /dev/null
+++ b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T14:30:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUYTvnXW3b3991IXgqQUMkP+nhKqkwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAwwUZ3JvdXBlci5pZGVtLmdhcnIuaXQwHhcNMTUwMzMwMjIx
+MzAwWhcNMzUwMzMwMjIxMzAwWjAfMR0wGwYDVQQDDBRncm91cGVyLmlkZW0uZ2Fy
+ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7913BgHLAXXvsj
+37Sg8o8tjoXNo/C13zueCqiIJKsu2qhpwiy7KpgLADpCzLFArgT0r/aup0saMFfx
+tUa8et39E0TfPwNBLeI77TUt7QE/NHtVwDph8d0ocizAxqJC1yhUMSuwDzRU/U5H
+Y1qGJ6NrmzYqG4dKNr5CC+FUhDfdSn/UJ8o95PLV7xkqpDCcXf2WVSSmGAlR1jDP
+rdE9PcfNSvNzA71EaYTdlUXr/MadlNFf7H7rgEyZwqHrIQGjizpcWsPrZW1k0ZlB
+pgLjZFK5w0lzcS5Qt0gjdYJvdmTlyt2AZ4XurrKGMaAFNc/004DMnQYG1EYxr0kr
+LoCQV3kCAwEAAaNvMG0wHQYDVR0OBBYEFPnHU6MSgDLEwrBmW9dmMwBp/YStMEwG
+A1UdEQRFMEOCFGdyb3VwZXIuaWRlbS5nYXJyLml0hitodHRwczovL2dyb3VwZXIu
+aWRlbS5nYXJyLml0L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQB6
+X8cCYmz+iKywoiMIlXxMGRXtACODRIWh8jdUqyJwUdHqvmSPnaHSjW41By4wZcFx
+GRwURHaJfFqpG6JMFbIIlBmmdroQ02vWWalA9bhShgBhbGiHbKw4Clma9n7jDFtT
+UTEYR6Riveae/n9/PYBQrFnrMTsoV/0ig20VI70bTyY4wBkTTJgwYNon+MpMGp34
+N34CsdueAafyNMLr+BdNqmDpbLUncKxGU0z56M5r1xD/oYpWzm3asUHqPuojtFlb
+KwS+Xn3HU5Hd928ljFR+l+62LhqN8zb5SaNCJkfDkGlZU0RZEAYAWq7v5mk3A5oh
+KYJMKvnMhrAnlcxegh90
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Attribute Authority per IDEM by Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Attribute Authority for IDEM by Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDEM</md:GivenName>
+    <md:SurName>Help</md:SurName>
+    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>