resolve conflicts and merge

1 files changed, 199 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
new file mode 100644
index 00000000..0866b4f5
--- /dev/null
+++ b/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fed.p.lodz.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-08-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">p.lodz.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lodz University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">Politechnika Łódzka</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Lodz University of Technology</mdui:Description>
+        <mdui:Description xml:lang="pl">Politechnika Łódzka</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>
+MIIDHzCCAgegAwIBAgIUf92tx4MSZkG0nD2gvKf1684tQsYwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTJaFw0z
+NTAzMTkxMjIzNTJaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQClJEvUpbTZ2twCfK6BPayJ+NOosjc+5yQQ
+82+oQPkK9AUBj3L5nG1d8S0ytNrP023FBEPHqlKrrP1IYFr6//tZMG77pz4iJkAI
+bP3ALXmd0DkDbEk5f0lZRbgicRsNUqG/XZ+YU2vptTM+qjeRN6oC4kTfy2hyT6ZT
+l0QFQudrh8DXXnC//2PcIp2LJOVpi/s0bkx17CsFe1wXKGiE+IRjxREwMPsjhZcL
+0kRyOWvNFgZJdYA7QwbwpX2r4JO9QtPJlj0r5a+AlmqFvXRrYHoZRY/xjiFsE5da
+LhA3/T/qpJTSuOLq/OAKdg7btY3NXyUVEA96YjLM7sB+3pH5f0LvAgMBAAGjYTBf
+MB0GA1UdDgQWBBSMCHpJHpAfliH4Oas5962Zaj4F9jA+BgNVHREENzA1gg1mZWQu
+cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAFMj2tTRqW2cjCBtUrYQvkrbS9ThyMeskXqBlv8Z
+yuK5649zIrA3A9u/DYHum9bVf+gfvcIPfMTmBdcthMVTJIz4jD0B+Q6UdYO+YLnb
+GIHo5I6+5YcaiHG3vDJ8bwQQ0c3y2BV+xXazoPUHMQAQhw657P3zVVmXQrBL81S8
+jrKFuLnw92jEyfvJvanV5hGLq6/sFIlFYMIXjVp60rkn/jYiVRy46GPZXzyuTQfN
+wnHFEgO9IZFWIfExNj8Vs2cWxZd4P6r6D7IXbeEtPz53yfi3t28vATtQKi12JHEC
+16rusRPe4GqH6oWfMN55z6Hl6dBDSFxv0xuqLKZZQOA5sa4=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVALBJ54FSifljTYxqdKs9piNvZRmGMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwHhcNMTUwMzE5MTIyMzQ5WhcN
+MzUwMzE5MTIyMzQ5WjAYMRYwFAYDVQQDDA1mZWQucC5sb2R6LnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAht1Z4j3LNunoGUj0Xg1mVFm1pC9G2h/W
+KJx9e6hpsQNeOV164mLeDocnSPZz0sN8yMOdtPKgRp11pqjxY80Y62fbmL4Z5VzR
+S5LSPb4RwK8bDt+Y5VrpEQfahyhKn4FTv0ONx3ayQHhBkeVtwv6m5OcKbohTP4KL
+Ga//7AA1yUuSHOMsNs5Jl0+Qw+pnrqq0NdxuJNUVvpzmsy/LECw4yT1TYPtmKIT0
+BRoKFnptuAvUeuzI8X4Sk7nHPmnwkEVTCXm5KlCdRrrRAXOv75rCMnoHwlljGArW
+N8pr5Bi95j2/JTspzdD+Sd4ZJ2KL0RbLB7WJzxwdxdU2brJmzvyAHQIDAQABo2Ew
+XzAdBgNVHQ4EFgQU5pnJ2LRleP5CXaU7Q3p13pllUXQwPgYDVR0RBDcwNYINZmVk
+LnAubG9kei5wbIYkaHR0cHM6Ly9mZWQucC5sb2R6LnBsL2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAqca7YchwV5OSyMoKyVAka7UJfaUiL45t4lhjx
+GQK715ftzkPITSuOnt+xrx5JHLWyw47xNIj+W+HckkhnWpeQ4QQrEAO8T63pZrUv
+H+gOYWqKOaYum0D1+CaBen29Unts9Ie9hiqFg5yUy40LG10JYZeGcYMLw4f5b+Sz
+K9z2eS9vbYBf7F2snpz/PG2XWXhh3qgQAvQfgNhlT81IjRyYZQhjFKdw+Oiklp+Z
+J25Z/5z3Qt2aL7DuQC5/9xfyPmI0K6fHnMIkpE+t9XGXLCvQgVmCzzudXLdaVIwf
+NzpyfHJJG9+8ns6iv60kTPTWKis5/IMSjcdeGmyUvDzEqs8I
+                        </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>
+MIIDHzCCAgegAwIBAgIUNXScWBo43xj5lpqlUdGPP9YZL3QwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTBaFw0z
+NTAzMTkxMjIzNTBaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQChdv4HP1QY4J29sh1jYKp5J0NAVAOyc1wv
+MBAtrEQYoVT3QETu5380X/ZBVwpOrxUa5andF6XcNxhK3TlTj6XqbOeEboL9yGqc
+Hhu5GRFjHfTUmPKsEsuIPT7g8yVuR/kqVq7CvNkbi1hse2ZPDf0WXDmDJeG+DdXc
+txyuRtG+mn/b5/faxneH7lNgK/Vv/ciM66ezNBtjqB94QtZNmCosuHJmzuEYbwMF
+NEFLBfNeaxdu5GPnHXZJdGRcoKzYIL3f5tEKMXV0OFnE5PekRiWl1rkPgDyLgY41
+wwz5l9J1lere/jSxRTJJxXdg9KVc9CtRyCSKh41Z7jlaAP7Oy3mdAgMBAAGjYTBf
+MB0GA1UdDgQWBBTuGHz++Xnn/VzfXKWxhyTT+h9CXTA+BgNVHREENzA1gg1mZWQu
+cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAFi7u1NDWSQzg9qV3Jfc6kXX/JoBYw4fD0E4dUSg
+e4Dt2jDy42Psv1lBedpDN9Z/SWCl5C9X5qFRh6aGOTC1Az/j0XNuU4l9lx4DBXyO
+8Go9+znYd2l5bLkekCh2FF/EhCCHikhG0BAzc/m3n/FI+SC+pR3noUkTFChsj/YO
+v+rTqPYf+nXDtjzxOTy7iXJewLd0AaC4cK9BeOED5RyZADtK76zhv9pkUJwK1mWr
+nneqUZTQqcy82KLNUIk6u943LlhuqCXzy/idqKydkbAMxo4ZtL6mLFIBuAgU8Tm7
+4J3XCqnActMT97Zf5r6j4RjYBhiuFU30SvNV857zAr+/noQ=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.p.lodz.pl/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fed.p.lodz.pl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.p.lodz.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">p.lodz.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUf92tx4MSZkG0nD2gvKf1684tQsYwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTJaFw0z
+NTAzMTkxMjIzNTJaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQClJEvUpbTZ2twCfK6BPayJ+NOosjc+5yQQ
+82+oQPkK9AUBj3L5nG1d8S0ytNrP023FBEPHqlKrrP1IYFr6//tZMG77pz4iJkAI
+bP3ALXmd0DkDbEk5f0lZRbgicRsNUqG/XZ+YU2vptTM+qjeRN6oC4kTfy2hyT6ZT
+l0QFQudrh8DXXnC//2PcIp2LJOVpi/s0bkx17CsFe1wXKGiE+IRjxREwMPsjhZcL
+0kRyOWvNFgZJdYA7QwbwpX2r4JO9QtPJlj0r5a+AlmqFvXRrYHoZRY/xjiFsE5da
+LhA3/T/qpJTSuOLq/OAKdg7btY3NXyUVEA96YjLM7sB+3pH5f0LvAgMBAAGjYTBf
+MB0GA1UdDgQWBBSMCHpJHpAfliH4Oas5962Zaj4F9jA+BgNVHREENzA1gg1mZWQu
+cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAFMj2tTRqW2cjCBtUrYQvkrbS9ThyMeskXqBlv8Z
+yuK5649zIrA3A9u/DYHum9bVf+gfvcIPfMTmBdcthMVTJIz4jD0B+Q6UdYO+YLnb
+GIHo5I6+5YcaiHG3vDJ8bwQQ0c3y2BV+xXazoPUHMQAQhw657P3zVVmXQrBL81S8
+jrKFuLnw92jEyfvJvanV5hGLq6/sFIlFYMIXjVp60rkn/jYiVRy46GPZXzyuTQfN
+wnHFEgO9IZFWIfExNj8Vs2cWxZd4P6r6D7IXbeEtPz53yfi3t28vATtQKi12JHEC
+16rusRPe4GqH6oWfMN55z6Hl6dBDSFxv0xuqLKZZQOA5sa4=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVALBJ54FSifljTYxqdKs9piNvZRmGMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwHhcNMTUwMzE5MTIyMzQ5WhcN
+MzUwMzE5MTIyMzQ5WjAYMRYwFAYDVQQDDA1mZWQucC5sb2R6LnBsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAht1Z4j3LNunoGUj0Xg1mVFm1pC9G2h/W
+KJx9e6hpsQNeOV164mLeDocnSPZz0sN8yMOdtPKgRp11pqjxY80Y62fbmL4Z5VzR
+S5LSPb4RwK8bDt+Y5VrpEQfahyhKn4FTv0ONx3ayQHhBkeVtwv6m5OcKbohTP4KL
+Ga//7AA1yUuSHOMsNs5Jl0+Qw+pnrqq0NdxuJNUVvpzmsy/LECw4yT1TYPtmKIT0
+BRoKFnptuAvUeuzI8X4Sk7nHPmnwkEVTCXm5KlCdRrrRAXOv75rCMnoHwlljGArW
+N8pr5Bi95j2/JTspzdD+Sd4ZJ2KL0RbLB7WJzxwdxdU2brJmzvyAHQIDAQABo2Ew
+XzAdBgNVHQ4EFgQU5pnJ2LRleP5CXaU7Q3p13pllUXQwPgYDVR0RBDcwNYINZmVk
+LnAubG9kei5wbIYkaHR0cHM6Ly9mZWQucC5sb2R6LnBsL2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQAqca7YchwV5OSyMoKyVAka7UJfaUiL45t4lhjx
+GQK715ftzkPITSuOnt+xrx5JHLWyw47xNIj+W+HckkhnWpeQ4QQrEAO8T63pZrUv
+H+gOYWqKOaYum0D1+CaBen29Unts9Ie9hiqFg5yUy40LG10JYZeGcYMLw4f5b+Sz
+K9z2eS9vbYBf7F2snpz/PG2XWXhh3qgQAvQfgNhlT81IjRyYZQhjFKdw+Oiklp+Z
+J25Z/5z3Qt2aL7DuQC5/9xfyPmI0K6fHnMIkpE+t9XGXLCvQgVmCzzudXLdaVIwf
+NzpyfHJJG9+8ns6iv60kTPTWKis5/IMSjcdeGmyUvDzEqs8I
+                        </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>
+MIIDHzCCAgegAwIBAgIUNXScWBo43xj5lpqlUdGPP9YZL3QwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTBaFw0z
+NTAzMTkxMjIzNTBaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQChdv4HP1QY4J29sh1jYKp5J0NAVAOyc1wv
+MBAtrEQYoVT3QETu5380X/ZBVwpOrxUa5andF6XcNxhK3TlTj6XqbOeEboL9yGqc
+Hhu5GRFjHfTUmPKsEsuIPT7g8yVuR/kqVq7CvNkbi1hse2ZPDf0WXDmDJeG+DdXc
+txyuRtG+mn/b5/faxneH7lNgK/Vv/ciM66ezNBtjqB94QtZNmCosuHJmzuEYbwMF
+NEFLBfNeaxdu5GPnHXZJdGRcoKzYIL3f5tEKMXV0OFnE5PekRiWl1rkPgDyLgY41
+wwz5l9J1lere/jSxRTJJxXdg9KVc9CtRyCSKh41Z7jlaAP7Oy3mdAgMBAAGjYTBf
+MB0GA1UdDgQWBBTuGHz++Xnn/VzfXKWxhyTT+h9CXTA+BgNVHREENzA1gg1mZWQu
+cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
+DQYJKoZIhvcNAQELBQADggEBAFi7u1NDWSQzg9qV3Jfc6kXX/JoBYw4fD0E4dUSg
+e4Dt2jDy42Psv1lBedpDN9Z/SWCl5C9X5qFRh6aGOTC1Az/j0XNuU4l9lx4DBXyO
+8Go9+znYd2l5bLkekCh2FF/EhCCHikhG0BAzc/m3n/FI+SC+pR3noUkTFChsj/YO
+v+rTqPYf+nXDtjzxOTy7iXJewLd0AaC4cK9BeOED5RyZADtK76zhv9pkUJwK1mWr
+nneqUZTQqcy82KLNUIk6u943LlhuqCXzy/idqKydkbAMxo4ZtL6mLFIBuAgU8Tm7
+4J3XCqnActMT97Zf5r6j4RjYBhiuFU30SvNV857zAr+/noQ=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lodz University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Politechnika Łódzka</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lodz University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Politechnika Łódzka</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.p.lodz.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Biura Obsługi Klientów Centrum Komputerowego</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:bok@p.lodz.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>