From f25665a983fa1c05605f176ed7f403d7f4633859 Mon Sep 17 00:00:00 2001
From: Anders Lördal <anders@lordal.se>
Date: Thu, 2 Jun 2016 08:01:30 +0200
Subject: Resolves SWAMIDOPS-8222

---
 swamid-2.0/idp.fhs.se-swamid.xml | 38 --------------------------------------
 swamid-testing-idp-1.0.mxml      |  1 -
 2 files changed, 39 deletions(-)
 delete mode 100644 swamid-2.0/idp.fhs.se-swamid.xml

diff --git a/swamid-2.0/idp.fhs.se-swamid.xml b/swamid-2.0/idp.fhs.se-swamid.xml
deleted file mode 100644
index bd6d97c2..00000000
--- a/swamid-2.0/idp.fhs.se-swamid.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.fhs.se/swamid">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Försvarshögskolan (Test IdP)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Försvarshögskolan (Test IdP)</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDWjCCAkKgAwIBAgIECstPOzANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJTRTEMMAoGA1UECBMDbi9hMRIwEAYDVQQHEwlTdG9ja2hvbG0xHDAaBgNVBAoUE0bDtnJzdmFyc2jDtmdza29sYW4xCzAJBgNVBAsTAklUMRMwEQYDVQQDEwppZHAuZmhzLnNlMB4XDTE1MDkyODA4MzA1MVoXDTE2MDkyNzA4MzA1MVowbzELMAkGA1UEBhMCU0UxDDAKBgNVBAgTA24vYTESMBAGA1UEBxMJU3RvY2tob2xtMRwwGgYDVQQKFBNGw7Zyc3ZhcnNow7Znc2tvbGFuMQswCQYDVQQLEwJJVDETMBEGA1UEAxMKaWRwLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOOVBqw3xqJb+6NCOmX52UPoEwlAbAVsB+GstwdPWgVez/6OlQ+E1XiJWAK8SinxZv+wX1P8sKFKxWtwNe7VcxrqwlhYc9xTKfJs9XQBHiqpDd1Zd2lIQwTZ6qdZV6DrteBIVQRiiBSbE6KP+bEpA5qWEBIs3LPh5AFZLh7tD1HnBARYhyWc9n9d5t7OZYTKTs9gBZ50Hl5d6UvFR2xbf6QQ0DQqzDD0DAZfTXurfmVWISyPzhe7dtW/SEW26PVlqgGvzVK9demqhWfCvqY/DGS4hFc4nUCWc+6jeRElt36vGUBV0h3VAARebGQfXdZ/+TJEJ7zJ/QW5RGOGTeG4v70CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAc7ii8aCg0OpUC7/hVmx7Jtv3uWfUKXO5m/KAsXb9/Sn9T8tHNTlo5NVPaUoBsc6/YPq/hJKut0hyQDDANA084I8oRHk/glefRcVfDk4ZlhKfOUlKnCMxP2ELFf4XOB2S7OCop0oXC7s9UAKx0uI7sI8rUO5at5tFA1vEiLHVEMlV+0hTjOtlQXT59ECOaBOBRA4Qh/KmwELv15Iqe0KQWFyHyIUOKgfGz8riq/HkYNt8YhEGqYFAlDT2JVTLPlHz6ZqzNzDBnYF4hV+EFW08urJ5r7efcHcMhJeQJzogJJzVfAHmk24vWSQ5WX80KR9X7YJKtnlDEEtmZwKDHW55wQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fhs.se/saml/idp/profile/post/sls" ResponseLocation="https://idp.fhs.se/saml/idp/profile/post/slr"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fhs.se/saml/idp/profile/redirectorpost/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fhs.se/saml/idp/profile/redirectorpost/sso"/>
-    <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" Name="eppn"/>
-    <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" Name="surname"/>
-    <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" Name="upn"/>
-    <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" Name="name"/>
-    <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" Name="givenname"/>
-    <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" Name="emailaddress"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">FHSTEST</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Försvarshögskolan (Test IdP)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Försvarshögskolan (Test IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fhs.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>FHS</Company>
-    <EmailAddress>alex.sjoblom@fhs.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 89068d43..29ac85d6 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -45,7 +45,6 @@
   <xi:include href="swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.fhs.se-swamid.xml"/>
   <xi:include href="swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testidp.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
-- 
cgit v1.2.3