From 70cea032b3d8d0d49748bc1794ef6a8bf14367ec Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Mon, 29 Jan 2018 09:17:41 +0100
Subject: Resolved SWAMID-398

---
 swamid-2.0/idp.kkh.se-idp-shibboleth.xml | 129 -------------------------------
 swamid-idp-2.0.mxml                      |   1 -
 2 files changed, 130 deletions(-)
 delete mode 100644 swamid-2.0/idp.kkh.se-idp-shibboleth.xml

diff --git a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
deleted file mode 100644
index 0c1858ff..00000000
--- a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.kkh.se/idp/shibboleth">
-  <Extensions>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
-    </attr:EntityAttributes>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </attr:EntityAttributes>
-  </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">kkh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan - Old</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Royal Institute of Art - Old</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">http://kkh.se/index.php/sv/om-kkh</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://kkh.se/index.php/en/about-kkh</mdui:InformationURL>
-        <mdui:Logo height="110" width="404">https://idp.kkh.se/idp/images/kkh.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://kkh.se/images/stories/helens/Personuppgifter_KKH_infotext.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kkh.se</mdui:DomainHint>
-        <mdui:IPHint>130.242.7.0/24</mdui:IPHint>
-        <mdui:IPHint>130.242.8.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.324458,18.082998</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVANZ+rVePFlHJtqutoy3Mh9qeZKtuMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTQxMjEyMDcxOTI1WhcNMzQx
-MjEyMDcxOTI1WjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAm8Np4yJz6CjpvlsIS3p9E7tYXhC+mcxCVMBlSq+1
-FuhKiwoC4IhA0Zht9YDf6KS9z3JZTQ5UDpCikgUcr8KyBwOz5KJhIyELZbQJtvae
-8+5sK5InUCWG3utIA0KpVx/OM46yBfG8Vq7HJUuZTRsM3538nEgrnUJWn3Hruds4
-a1aJFTjbhZsntVh1VzuM/O6F1Y11uaVpRnSvX/kWqrwW0zfAd6fsqDfB9qhqsvHD
-p5EwJ5SR9W1p+1RzvZKiPVr2UHd83izjncf1myrxT7jKwEamMbHnC/MnRo2Jn/Bu
-VTuz4tnmnvfnaVKyp7MOMjmiSvKggUqzu2uIx6fSuEr+WwIDAQABo1swWTAdBgNV
-HQ4EFgQUbLroM3/7JnvbagCwSlCTDIW+CNQwOAYDVR0RBDEwL4IKaWRwLmtraC5z
-ZYYhaHR0cHM6Ly9pZHAua2toLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQBNt8sEoLRpIMFTjPx/PyUDatWTlp7a5SCtuTwr552b7UvRetz9rDwL
-ip2x2eHt6JoiHx7OabzAOL4oDo/akaqopY0tcmhjrRRw1tuuOxSZiejIh2DXmkn8
-9I/nIGsYx6mFD/yEXMg9pacV+HGQUdvUPpKyYjfMHihz/5A2Q+Qj6PjUthCNR6KX
-rkzEd5A2/OKLgeYgcrLEpShVXxIs2PxwOj3zgNJblb8dT00sajTf9usa9WZk6R9q
-qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
-/u55VifGWHpaCkgtHFGyHuq6l7I7vZ1A</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kkh.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kkh.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kkh.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kkh.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kkh.se/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">kkh.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVANZ+rVePFlHJtqutoy3Mh9qeZKtuMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTQxMjEyMDcxOTI1WhcNMzQx
-MjEyMDcxOTI1WjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAm8Np4yJz6CjpvlsIS3p9E7tYXhC+mcxCVMBlSq+1
-FuhKiwoC4IhA0Zht9YDf6KS9z3JZTQ5UDpCikgUcr8KyBwOz5KJhIyELZbQJtvae
-8+5sK5InUCWG3utIA0KpVx/OM46yBfG8Vq7HJUuZTRsM3538nEgrnUJWn3Hruds4
-a1aJFTjbhZsntVh1VzuM/O6F1Y11uaVpRnSvX/kWqrwW0zfAd6fsqDfB9qhqsvHD
-p5EwJ5SR9W1p+1RzvZKiPVr2UHd83izjncf1myrxT7jKwEamMbHnC/MnRo2Jn/Bu
-VTuz4tnmnvfnaVKyp7MOMjmiSvKggUqzu2uIx6fSuEr+WwIDAQABo1swWTAdBgNV
-HQ4EFgQUbLroM3/7JnvbagCwSlCTDIW+CNQwOAYDVR0RBDEwL4IKaWRwLmtraC5z
-ZYYhaHR0cHM6Ly9pZHAua2toLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQBNt8sEoLRpIMFTjPx/PyUDatWTlp7a5SCtuTwr552b7UvRetz9rDwL
-ip2x2eHt6JoiHx7OabzAOL4oDo/akaqopY0tcmhjrRRw1tuuOxSZiejIh2DXmkn8
-9I/nIGsYx6mFD/yEXMg9pacV+HGQUdvUPpKyYjfMHihz/5A2Q+Qj6PjUthCNR6KX
-rkzEd5A2/OKLgeYgcrLEpShVXxIs2PxwOj3zgNJblb8dT00sajTf9usa9WZk6R9q
-qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
-/u55VifGWHpaCkgtHFGyHuq6l7I7vZ1A</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se: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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KKH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan - Old</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Royal Institute of Art - Old</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kkh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Kungl. Konsthögskolan</Company>
-    <SurName>Fredrik Reuterswärd</SurName>
-    <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
-    <TelephoneNumber>+4686144064</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Kungl. Konsthögskolan</Company>
-    <SurName>Fredrik Reuterswärd</SurName>
-    <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
-    <TelephoneNumber>+4686144064</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Kungl. Konsthögskolan</Company>
-    <SurName>Fredrik Reuterswärd</SurName>
-    <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
-    <TelephoneNumber>+4686144064</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 56d9e8f9..f215230e 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -16,5 +16,4 @@
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.kkh.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3