From 71d0647f6edac4dbb729ad53c9083e811aec2b04 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 3 Jun 2019 11:35:58 +0000
Subject: Partially resolves SWAMID-2198

---
 swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml  | 23 ----------------------
 ...tive.org-confluence-plugins-servlet-samlsso.xml |  4 ++++
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
index 1426cca3..df77cdcd 100644
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -3,29 +3,6 @@
   <Extensions>
     <shibmd:Scope xmlns="" regexp="false">suni.se</shibmd:Scope>
   </Extensions>
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC3jCCAcagAwIBAgIQIkwNwJfVWptHttTrpB3rNDANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBpZHAtdjIuc3VuaS5zZTAeFw0xOTAzMTkxMTA5NDlaFw0yOTAzMTYxMTA5NDlaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGlkcC12Mi5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqMlb2IIsV9GO1iS5FLuhJsrLbnWd/0OXt1Wj14ezOxF53BwgLtV41SM0pkKt3z8UHD2zREc7xNsTitbPAkgTPclxFzGB+mtKUEzAwgrexEJ9JH6jTdVGP2OBKFhUAu/HRE5o650rZnhk2nB9sIw70EucHdjVuNe05SZRCmZAQ4HfoDXmk8ErJD31vD/JZLgtrErEM0biIr9d/5q5iSla0AQu57pkQe8WPw+HDvKMDpUZlRGq+lnk5DtMb4RC80aMA5isvKwtK0JszB+QFCLoUJN6BQHfK+Rx96htlaQjRwBvTv5zEhMPO2q+nlaAifRAtxlpYUPm2TgnZi+DCwXH/QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCjrunhaobr/YVPRa+19IYgA6fnatRHqaT+oScinTHqErsi6j9ixyK2WvVAMnjIa4miu/6HK6Vg7l7/RcsOXUJt+YFQYV+sPM/O6BbqZPDgF6tHVFBFiR378WMmgDttm8w5aVQu1JlE3fqY3iswuas6lIoKV6g3PQC3IzspJbIb6B3euzmcZ3G1rOWod5tN3laEMgknqJgrl5qQs641bEZa76quQEFC8cEEN/neudh4pWdWjHbmjRqOum3E4uzB6raOzKDuSAI3OxITFlAHoPxsHxr4QbmRaVmq1b00hVS+BVjNbFO73mtnq5rQOl/cUj+gJ3k4oG1fWOMV0t/Q0p0p</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC2DCCAcCgAwIBAgIQbkY9lWXDKI1D4sdF+i8NgDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBpZHAtdjIuc3VuaS5zZTAeFw0xOTAzMTkxMTA5NDhaFw0yOTAzMTYxMTA5NDhaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGlkcC12Mi5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA39GVqOrXOHszgzr/gu9b/qbpUvPyib4KHoPULNewurYFJIZn4zwPwkJlh6cVgzOhzxoj9GS64tWmVF7+6ycG+XER6m6qNmCgcWTWBhEgiBl9208h831RndRK06TwxRbWL1WdxQ00v6II+s35AO9CN9HYHZoQMH8ga/LEnOlGNXhHoPbaec4WfKAWfWXqy/eei9P4YeKWkefuKjhUkD3twZ+9S6b7rHMvf4gOvnIL4+dOOzlgrIzSBSEJeW2kHTVkuLfUsjIqWu51hM/9+LW1mHV16Ewx1DVqff2N/9h+xxtZHDjaHr/Haa1YW9HjgtPzaUxKKcJUS/r1cGp8oILUsQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAmfCcEwPUaq04Wgs3SS+OYtbiJQp2twSlY6rPSeVSVU5c4F9Epefjw0VEHMZupg5ZV6NRtHV0S5znx3yRe1w/hqCSphgQcfyPUcx/a4+lO4XM0glPJ9W/PkzjgiylPuCvrtVk1n15iC7xudxtb29B4IRL0l4NNJJhKzva1ZnGB+joC1p9xuuswgm1RWK+dgyyRAicps9ynpVMMZZ8uZCTMmawE2NfrTUcEhs4JSWpZBFaWLN25gaR4yHZlk1itL7SByWSM7pFCIKKcbjc5T67il7mZOSmChfBcgm5mGtgkj1xd+E/X+FPtQkzS9aX17hw94G/3O6iTV2t9EcDQvRvl</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-v2.suni.se/adfs/ls/" index="1"/>
-  </SPSSODescriptor>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns="" regexp="false">suni.se</shibmd:Scope>
diff --git a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
index c2e5177e..4e18e16d 100644
--- a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
+++ b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
@@ -59,4 +59,8 @@ PMS4rjAWc41dsrr8CuH3t/NKbvDc9Rn6U+qLGttLcJ1Jlpw2i3fPGGJ+osSsX9+h3KUdLv9j7zJB
     <md:OrganizationDisplayName xml:lang="en">Kantara Initiative Inc</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://kantarainitiative.org</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Kantara Initiative</md:SurName>
+    <md:EmailAddress>mailto:info@kantarainitiative.org</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3