resolve conflicts and merge

1 files changed, 92 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml b/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml
new file mode 100644
index 00000000..528fcfaa
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.theiet.org/shibboleth">
+  <!--
+		This is a Shibboleth SP for The Institution of Engineering and Technology.
+	-->
+  <Extensions>
+    <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"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-30T09:54:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <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>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.theiet.org/Shibboleth.sso/Login"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDITCCAgmgAwIBAgIJAN2I4zf0p8hfMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+						BAMTHjYzMzkzMy13c2VpMS5sb24uaW50ZW5zaXZlLmludDAeFw0xNTA3MjMwNzQy
+						MjdaFw0yNTA3MjAwNzQyMjdaMCkxJzAlBgNVBAMTHjYzMzkzMy13c2VpMS5sb24u
+						aW50ZW5zaXZlLmludDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJgw
+						uzjl7ojagD+weX2xP9tmanTdXC1S2Z+/RmlJFgTH3e8vuZGefGA/CiG0NZfhGeIA
+						IvLG1mNgq1XUk+i2zj0bpo1lf9ZD4+rM1WEDP9Is3o+CId4rlqlLEV1+wiWv+lKi
+						R9sYhub+SBNCsWbndUtgL8B9Uzi1wc4zQ7lvbV0MoCJPUGtdtK5eee+9VMD4MPOL
+						szTxCJg5vsU+bolurr0NB4lETrd93JVtp3kLRkygC1xzuBxreOUn5DTOVww0Sz2I
+						y1WRU9VK0BjbIJRnznHoLxQWbj7CgKuygI4vpOlt0HBzSC/6BB/3dUnHT9oxlZ3z
+						d3LY5Cy3k9tI9njU6sUCAwEAAaNMMEowKQYDVR0RBCIwIIIeNjMzOTMzLXdzZWkx
+						Lmxvbi5pbnRlbnNpdmUuaW50MB0GA1UdDgQWBBTweJWrTk3cVYECwy8wA49GfYVs
+						QTANBgkqhkiG9w0BAQUFAAOCAQEAltn6UF4taVBOa+wOMu7qRIw80TtFzaZLud15
+						f7OggdEiN7eXRnuvgPIegCPcPQstjTDQxG2yY+tStKlzwqMJLUbi0jYieAAQhWL1
+						xn+t/O2X89w7mgMQftVcgZO4qo3FA0qFhmSYRcqUQnBWWrN9+Upjv75qmZ9Y4f4J
+						m91hsYbVGg5wjb25Z+NMfaq9j4E+cta0w10ipCiUYjp+3c2BCTY8RfmvNjleBw2C
+						LS9D/jGafuWQZ6Wu2E7/tgGPdh3ncDsFwXEw4BBx3NVu8UxPuGBwBSzjl4JetuOM
+						EiKAsWccGKR+zkAE1ZQv9Kf0t1dxdsNPK9aoLqY1dO3dILZdow==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds: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://shib.theiet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.theiet.org/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.theiet.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.theiet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">The Institution of Engineering and Technology</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">The Institution of Engineering and Technology</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.theiet.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Ross</GivenName>
+    <SurName>London</SurName>
+    <EmailAddress>mailto:RLondon@theiet.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ravi</GivenName>
+    <SurName>Racharla</SurName>
+    <EmailAddress>mailto:ravi.racharla@northgate-is.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>