Resolved SWAMID-305

3 files changed, 0 insertions, 188 deletions

diff --git a/swamid-2.0/idp2.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp2.rkh.se-idp-shibboleth.xml
deleted file mode 100644
index a1be203e..00000000
--- a/swamid-2.0/idp2.rkh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,186 +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:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp2.rkh.se/idp/shibboleth">
-  <Extensions>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute 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>
-      <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </attr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Swedish Red Cross University College - NEW</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for the Swedish Red Cross University College - NEW</mdui:Description>
-        <mdui:Logo height="80" width="80">https://dw.rkh.se/Logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUZEMIZne7K4vffuSjiKzbW8HMYm0wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMi5ya2guc2UwHhcNMTYwODE3MTA0MTU1WhcNMzYw
-ODE3MTA0MTU1WjAWMRQwEgYDVQQDDAtpZHAyLnJraC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM1i3FrX7NaFE6TjDPQDj2Nk2yPVgVrg68Hv5Mun
-Af0Tk7tSigGGM9j2kyun353JbnMJpcJ+ijmlr6bO1j79Y1SdRHoyaDgMGr49f8KQ
-jH7ncEgBHJwvTVWMwvkoz6jVJKqIb9jGmDrCehA1bT+F1nUlevX8h+BVxGFL+7cE
-FbgFshbxAeomb5IDiy8b2zJ38E9W6BBlOV3pQo/p7V/w2q05Nthx7FZhptwF4geD
-AfjySdjlq4PvUc/ExUEb0EP2wMqc1ckEnGbxrI9mD+w2WSekenI01cvlUfSHL+oL
-hitBSgV0VNYYODAE3PUCrkVN6S3/o7uVrBMD+7aT21TmGI0CAwEAAaNdMFswHQYD
-VR0OBBYEFFvak+62rlfy5pATzD4OZWhpKzx3MDoGA1UdEQQzMDGCC2lkcDIucmto
-LnNlhiJodHRwczovL2lkcDIucmtoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBNzL8MszmWbmJha8EDTjDafxB6FaJDMfyYVbfiVVrp+9PpUMUf
-+afQ+XZA+BsCLqs49KzKVaxl/rGUqC+Yi5eLC5KyOFRJgH/xipeHWmiXVKjgt7lO
-QtTNrhp9d/c6Oi87kzOVMd/uyrT3FWMgXQZzMLrY5W/fP81XJ+mZyW+xsqV9XIL6
-KaBG5aWpp8bUySE7xWg3TmmeWNryn0+UNmzehdKk4XXDW2sN4KrI9tLyF30z6Ybl
-BXWJfzrNkSgPSZ1wsWDuf4qsjY1wg+owcFm28ubOft5/OKfsZhhTeyY6vf/kHEXM
-iIAKiVoHYRw7nmGAvG1ZF29z/4eU8dAx2ywE
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUF3SeYUWeB0Hwa1QcV0kWip71iNkwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMi5ya2guc2UwHhcNMTYwODE3MTA0MTUzWhcNMzYw
-ODE3MTA0MTUzWjAWMRQwEgYDVQQDDAtpZHAyLnJraC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJUGe+IALLM26sUCGCvjSlfM0canga4Gn3zbWm+m
-WIqMUiGv9PPWYwO7dvzKUz82lqGzOJxOMn8E4DzeelSQebbTLH6wVpsirEMiHGri
-Q9e2JvVeV7Brw4XbbG8uRkC0nkYr85OdmYFR5jc+dDWs7lTXddDeGnGFgk6xeho7
-UehrzETAqXjYOlVWimU6C8gVrqCdgW60hWvZE/AOiRCI9en+BzmT16UgCWZJSOZi
-xnRQTa0DOy26SqDWUpM43mMxzhu/TFl80N9x9+j2XYxSnZn755n6QPASnVQ4ayLz
-XfBg/uQZnmPQcEJzGb5HxgTUt2T/hwUsr4r3eKO0x2MToMkCAwEAAaNdMFswHQYD
-VR0OBBYEFMz/M0z//mFcJBmLiMFB0SjEBKunMDoGA1UdEQQzMDGCC2lkcDIucmto
-LnNlhiJodHRwczovL2lkcDIucmtoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQAfv9QtaZfyJmOcay9RqvGKvHmd8qEE7Aam/prV0nWWVkDN90Nd
-MIy66y59LW02UlFEm2vcrK9hFzlUStQrob+rwicyO99I38NdbDAt3BFKbXQcm3dm
-+El7pJtTC60a5G71/OlZbdiD197uSZyxcJC7f7zyMyBPf/Rc96zvPWzSCR53KxFw
-oJisctZEKBY6xzwswu3HMwQVtpam5Khn4Jhekt9HzHGJVwI8vV2b1Uv9opLC5OjX
-2xqL5E02+7Wtsj3NJQrJbPjMe2jYYpC0qF32wb6qg4x/qjxptUSqjsbRcEhprO0R
-1t3LQE5dnoGCx/fceIOxEub2qOvUcnm+K1u6
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUIDNbNwi47d5QD6dbTaqpylkxuIgwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMi5ya2guc2UwHhcNMTYwODE3MTA0MTU0WhcNMzYw
-ODE3MTA0MTU0WjAWMRQwEgYDVQQDDAtpZHAyLnJraC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALK7/8jp5J1K8evPAu0yl3D27lqrQ8F3yGH98Rp6
-FbLyXKs4a9fNDz7Y7Wx372s439ZVSZMd6qPtXklApiQTIXRfBN0xWBieHqUevLug
-IpfUYFKysMui4roHy6uDPz38L0MdoyU8n168UUC35XYv84/ei1iwty0zbyYNeVN0
-i3dW4/arF6zww/IY4AFJHDhsm+e2At7r6tWr5gH3AgNJB0ajJFjwp1GeSDdCA6Dx
-pNWAOc/O9RVAeHSPWSCrILdA5i5FAY/d8cg6puGQwVyWh9sARtTdfdAW5SQ5tgim
-aVTlNdRo35Zwf/wk6fltxsno5UFxRYGy0KKXV0U0GMIK7dMCAwEAAaNdMFswHQYD
-VR0OBBYEFPUXV+nXMkVbOSLTY0VmAjfhqS7FMDoGA1UdEQQzMDGCC2lkcDIucmto
-LnNlhiJodHRwczovL2lkcDIucmtoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQB2Cxo1HGIED1EJLwlE7AEN/+dWqntTfUd5hvw8EbtZ7TfYcKqS
-lmy5f9pE2yYCAukio2lcyTD96pPLI+TjGeOukIVgLBMupk6DWj+tZjLs5CcPRivJ
-qNJhooisJ4rAmPSy2spvwXLoTI73YrGnSPoEKwMfaDXsjgAeByBIrnEN1+1uhJVE
-OFMJ9TEb+XbvUqT3sTWQKZGYNg9wQkw7Ita7ZwvPo3S8ah7C4IC9yoyZlx8OQNL7
-/RF8+wwGtIiCWAHNsITRCIwYa2+VsaVf448tVsSzMNvsEIeSHEedHjt7TGO+tuRg
-ClUZ/AUP8pcAVPuanqi0m7Une99+H9Uzv+f5
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.rkh.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rkh.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.rkh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUZEMIZne7K4vffuSjiKzbW8HMYm0wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMi5ya2guc2UwHhcNMTYwODE3MTA0MTU1WhcNMzYw
-ODE3MTA0MTU1WjAWMRQwEgYDVQQDDAtpZHAyLnJraC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM1i3FrX7NaFE6TjDPQDj2Nk2yPVgVrg68Hv5Mun
-Af0Tk7tSigGGM9j2kyun353JbnMJpcJ+ijmlr6bO1j79Y1SdRHoyaDgMGr49f8KQ
-jH7ncEgBHJwvTVWMwvkoz6jVJKqIb9jGmDrCehA1bT+F1nUlevX8h+BVxGFL+7cE
-FbgFshbxAeomb5IDiy8b2zJ38E9W6BBlOV3pQo/p7V/w2q05Nthx7FZhptwF4geD
-AfjySdjlq4PvUc/ExUEb0EP2wMqc1ckEnGbxrI9mD+w2WSekenI01cvlUfSHL+oL
-hitBSgV0VNYYODAE3PUCrkVN6S3/o7uVrBMD+7aT21TmGI0CAwEAAaNdMFswHQYD
-VR0OBBYEFFvak+62rlfy5pATzD4OZWhpKzx3MDoGA1UdEQQzMDGCC2lkcDIucmto
-LnNlhiJodHRwczovL2lkcDIucmtoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBNzL8MszmWbmJha8EDTjDafxB6FaJDMfyYVbfiVVrp+9PpUMUf
-+afQ+XZA+BsCLqs49KzKVaxl/rGUqC+Yi5eLC5KyOFRJgH/xipeHWmiXVKjgt7lO
-QtTNrhp9d/c6Oi87kzOVMd/uyrT3FWMgXQZzMLrY5W/fP81XJ+mZyW+xsqV9XIL6
-KaBG5aWpp8bUySE7xWg3TmmeWNryn0+UNmzehdKk4XXDW2sN4KrI9tLyF30z6Ybl
-BXWJfzrNkSgPSZ1wsWDuf4qsjY1wg+owcFm28ubOft5/OKfsZhhTeyY6vf/kHEXM
-iIAKiVoHYRw7nmGAvG1ZF29z/4eU8dAx2ywE
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUF3SeYUWeB0Hwa1QcV0kWip71iNkwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMi5ya2guc2UwHhcNMTYwODE3MTA0MTUzWhcNMzYw
-ODE3MTA0MTUzWjAWMRQwEgYDVQQDDAtpZHAyLnJraC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJUGe+IALLM26sUCGCvjSlfM0canga4Gn3zbWm+m
-WIqMUiGv9PPWYwO7dvzKUz82lqGzOJxOMn8E4DzeelSQebbTLH6wVpsirEMiHGri
-Q9e2JvVeV7Brw4XbbG8uRkC0nkYr85OdmYFR5jc+dDWs7lTXddDeGnGFgk6xeho7
-UehrzETAqXjYOlVWimU6C8gVrqCdgW60hWvZE/AOiRCI9en+BzmT16UgCWZJSOZi
-xnRQTa0DOy26SqDWUpM43mMxzhu/TFl80N9x9+j2XYxSnZn755n6QPASnVQ4ayLz
-XfBg/uQZnmPQcEJzGb5HxgTUt2T/hwUsr4r3eKO0x2MToMkCAwEAAaNdMFswHQYD
-VR0OBBYEFMz/M0z//mFcJBmLiMFB0SjEBKunMDoGA1UdEQQzMDGCC2lkcDIucmto
-LnNlhiJodHRwczovL2lkcDIucmtoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQAfv9QtaZfyJmOcay9RqvGKvHmd8qEE7Aam/prV0nWWVkDN90Nd
-MIy66y59LW02UlFEm2vcrK9hFzlUStQrob+rwicyO99I38NdbDAt3BFKbXQcm3dm
-+El7pJtTC60a5G71/OlZbdiD197uSZyxcJC7f7zyMyBPf/Rc96zvPWzSCR53KxFw
-oJisctZEKBY6xzwswu3HMwQVtpam5Khn4Jhekt9HzHGJVwI8vV2b1Uv9opLC5OjX
-2xqL5E02+7Wtsj3NJQrJbPjMe2jYYpC0qF32wb6qg4x/qjxptUSqjsbRcEhprO0R
-1t3LQE5dnoGCx/fceIOxEub2qOvUcnm+K1u6
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUIDNbNwi47d5QD6dbTaqpylkxuIgwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMi5ya2guc2UwHhcNMTYwODE3MTA0MTU0WhcNMzYw
-ODE3MTA0MTU0WjAWMRQwEgYDVQQDDAtpZHAyLnJraC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALK7/8jp5J1K8evPAu0yl3D27lqrQ8F3yGH98Rp6
-FbLyXKs4a9fNDz7Y7Wx372s439ZVSZMd6qPtXklApiQTIXRfBN0xWBieHqUevLug
-IpfUYFKysMui4roHy6uDPz38L0MdoyU8n168UUC35XYv84/ei1iwty0zbyYNeVN0
-i3dW4/arF6zww/IY4AFJHDhsm+e2At7r6tWr5gH3AgNJB0ajJFjwp1GeSDdCA6Dx
-pNWAOc/O9RVAeHSPWSCrILdA5i5FAY/d8cg6puGQwVyWh9sARtTdfdAW5SQ5tgim
-aVTlNdRo35Zwf/wk6fltxsno5UFxRYGy0KKXV0U0GMIK7dMCAwEAAaNdMFswHQYD
-VR0OBBYEFPUXV+nXMkVbOSLTY0VmAjfhqS7FMDoGA1UdEQQzMDGCC2lkcDIucmto
-LnNlhiJodHRwczovL2lkcDIucmtoLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQB2Cxo1HGIED1EJLwlE7AEN/+dWqntTfUd5hvw8EbtZ7TfYcKqS
-lmy5f9pE2yYCAukio2lcyTD96pPLI+TjGeOukIVgLBMupk6DWj+tZjLs5CcPRivJ
-qNJhooisJ4rAmPSy2spvwXLoTI73YrGnSPoEKwMfaDXsjgAeByBIrnEN1+1uhJVE
-OFMJ9TEb+XbvUqT3sTWQKZGYNg9wQkw7Ita7ZwvPo3S8ah7C4IC9yoyZlx8OQNL7
-/RF8+wwGtIiCWAHNsITRCIwYa2+VsaVf448tVsSzMNvsEIeSHEedHjt7TGO+tuRg
-ClUZ/AUP8pcAVPuanqi0m7Une99+H9Uzv+f5
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 8c0b934a..e8fe2fc0 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -47,7 +47,6 @@
   <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp01.gih.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 66b1eca2..f2516469 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -49,7 +49,6 @@
   <xi:include href="swamid-2.0/nya-00.ladok.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testswamid.vr.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/rikards-idp.omv.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml"/>