summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-1.0.mxml1
-rw-r--r--swamid-1.0/samlidp.ki.se.xml118
-rw-r--r--swamid-idp-2.0.mxml1
-rw-r--r--swamid-interfederations-2.0.mxml1
-rw-r--r--swamid-interfederations-2.0/samlidp.ki.se.xml112
-rw-r--r--swamid-ki-sll-1.0.mxml1
6 files changed, 0 insertions, 234 deletions
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index a60eb931..04a42616 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -43,7 +43,6 @@
<xi:include href="swamid-1.0/connect-test.sunet.se.xml"/>
<xi:include href="swamid-1.0/login.liu.se.xml"/>
<xi:include href="swamid-1.0/converis.info.xml"/>
- <xi:include href="swamid-1.0/samlidp.ki.se.xml"/>
<xi:include href="swamid-1.0/sp.wavelan.su.se.xml"/>
<xi:include href="swamid-1.0/samadhi.kib.ki.se.xml"/>
<xi:include href="swamid-1.0/idp.nordu.net.xml"/>
diff --git a/swamid-1.0/samlidp.ki.se.xml b/swamid-1.0/samlidp.ki.se.xml
deleted file mode 100644
index 0eed632c..00000000
--- a/swamid-1.0/samlidp.ki.se.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<md:EntityDescriptor entityID="https://samlidp.ki.se/idp/shibboleth"
- xmlns:md="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">
-
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <md:Extensions>
- <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
- </md:Extensions>
-
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAJRIfZUHqE36X1wo3nmAK7/a0GBrMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNhbWxpZHAua2kuc2UwHhcNMDkwNzE1MDkxNjEwWhcN
-MjkwNzE1MDkxNjEwWjAYMRYwFAYDVQQDEw1zYW1saWRwLmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndLAX/sAb7KLdWo9SO4Xh3+TvCNZ/IoJ
-Cbzn68TtEYJ80JJI0HedJRb0b7BvpZuBGFzml7TRVbRNmiXIKNpabhiVzDUKfRoJ
-wloFtyI5k3EvunGwxE9kvkTbMRutsclF1eCYAOGLxH8kyBbvAU9S3ouxJ+1BxeSi
-g2OM1dtUXVHKOAesJ+OaLc76HsrBaeLEEJlquDM5BUR9vIlqVswK9rqcJGkXVoyP
-vbTwj1y2GAwIuXo2JnJ5YQYiPHxBl4T/+jLasDC5bpxTd5G/z16tYuhtafy5hYr+
-elqBJUnANL+W1fYzlC9uzRtTYHqBT6VjrK0gji8toaiVr0oSeh6pxQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zYW1saWRwLmtpLnNlhiRodHRwczovL3NhbWxpZHAua2ku
-c2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC0rBm/3TPyAM04dzkXTF/iDFeHL
-MA0GCSqGSIb3DQEBBQUAA4IBAQCVEBymTnCX9oJtcbzKBE91s84dvllXnVVYxoZe
-foKBs+1z/9vNV2YC+3jS6G2Ws5NH7MNx8uhHHNcEzpoqol8fkrhtKRr1rmEjrZHj
-hJ1+DLCDLV6/rvh9/Qw1OoozKGbERMczImkB65LddYJn/HqkJNbOio2nQe1yFuxD
-e2uMNb5IldFcRQ2O1p2slZhmR8h25g64mB9xzLso7+Y+zLoGYuIild2zlQ6QOcAP
-ZHbViHEq6MAKR86+yiVaEalpQOsUOILf21GWsZiTjT70uAMx84RzjVMS0LhgxJu5
-KgetXg7iTjcWRVve8lVZNG2foRZdbmOXow95IEKdfewtfiYR
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
-
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://samlidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://samlidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <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://samlidp.ki.se/idp/profile/Shibboleth/SSO" />
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://samlidp.ki.se/idp/profile/SAML2/POST/SSO" />
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://samlidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://samlidp.ki.se/idp/profile/SAML2/Redirect/SSO" />
- </md:IDPSSODescriptor>
-
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <md:Extensions>
- <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
- </md:Extensions>
-
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAJRIfZUHqE36X1wo3nmAK7/a0GBrMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNhbWxpZHAua2kuc2UwHhcNMDkwNzE1MDkxNjEwWhcN
-MjkwNzE1MDkxNjEwWjAYMRYwFAYDVQQDEw1zYW1saWRwLmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndLAX/sAb7KLdWo9SO4Xh3+TvCNZ/IoJ
-Cbzn68TtEYJ80JJI0HedJRb0b7BvpZuBGFzml7TRVbRNmiXIKNpabhiVzDUKfRoJ
-wloFtyI5k3EvunGwxE9kvkTbMRutsclF1eCYAOGLxH8kyBbvAU9S3ouxJ+1BxeSi
-g2OM1dtUXVHKOAesJ+OaLc76HsrBaeLEEJlquDM5BUR9vIlqVswK9rqcJGkXVoyP
-vbTwj1y2GAwIuXo2JnJ5YQYiPHxBl4T/+jLasDC5bpxTd5G/z16tYuhtafy5hYr+
-elqBJUnANL+W1fYzlC9uzRtTYHqBT6VjrK0gji8toaiVr0oSeh6pxQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zYW1saWRwLmtpLnNlhiRodHRwczovL3NhbWxpZHAua2ku
-c2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC0rBm/3TPyAM04dzkXTF/iDFeHL
-MA0GCSqGSIb3DQEBBQUAA4IBAQCVEBymTnCX9oJtcbzKBE91s84dvllXnVVYxoZe
-foKBs+1z/9vNV2YC+3jS6G2Ws5NH7MNx8uhHHNcEzpoqol8fkrhtKRr1rmEjrZHj
-hJ1+DLCDLV6/rvh9/Qw1OoozKGbERMczImkB65LddYJn/HqkJNbOio2nQe1yFuxD
-e2uMNb5IldFcRQ2O1p2slZhmR8h25g64mB9xzLso7+Y+zLoGYuIild2zlQ6QOcAP
-ZHbViHEq6MAKR86+yiVaEalpQOsUOILf21GWsZiTjT70uAMx84RzjVMS0LhgxJu5
-KgetXg7iTjcWRVve8lVZNG2foRZdbmOXow95IEKdfewtfiYR
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
-
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://samlidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://samlidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
-
- <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:AttributeAuthorityDescriptor>
-
- <md:Organization>
- <md:OrganizationName xml:lang="en">KIOLD</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet (TEST)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
- </md:Organization>
- <md:ContactPerson contactType="technical">
- <md:Company>Karolinska Institutet</md:Company>
- <md:EmailAddress>it-support@ki.se</md:EmailAddress>
- </md:ContactPerson>
-
-</md:EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 42f4910d..33cf6fcc 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -23,7 +23,6 @@
<xi:include href="swamid-1.0/idp2.kau.se.xml"/>
<xi:include href="swamid-1.0/shibb1.hj.se.xml"/>
<xi:include href="swamid-1.0/idp.bth.se.xml"/>
- <xi:include href="swamid-1.0/samlidp.ki.se.xml"/>
<xi:include href="swamid-2.0/idp.kb.se.xml"/>
<xi:include href="swamid-1.0/signon.hh.se.xml"/>
<xi:include href="swamid-1.0/vmidgw3.miun.se.xml"/>
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index f343b505..52fe2e64 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -218,7 +218,6 @@
<xi:include href="swamid-interfederations-2.0/rxauth.reaxys.com.xml"/>
<xi:include href="swamid-interfederations-2.0/saml-1.sys.kth.se.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/samlidp.ki.se.xml"/>
<xi:include href="swamid-interfederations-2.0/saml.xi.dante.org.uk.xml"/>
<xi:include href="swamid-interfederations-2.0/sandbox.aai.niif.hu.xml"/>
<xi:include href="swamid-interfederations-2.0/scauth.scopus.com.xml"/>
diff --git a/swamid-interfederations-2.0/samlidp.ki.se.xml b/swamid-interfederations-2.0/samlidp.ki.se.xml
deleted file mode 100644
index 9c29a08e..00000000
--- a/swamid-interfederations-2.0/samlidp.ki.se.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://samlidp.ki.se/idp/shibboleth">
-<md:Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-<mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</md:Extensions>
-
- <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
- </md:Extensions>
-
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAJRIfZUHqE36X1wo3nmAK7/a0GBrMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNhbWxpZHAua2kuc2UwHhcNMDkwNzE1MDkxNjEwWhcN
-MjkwNzE1MDkxNjEwWjAYMRYwFAYDVQQDEw1zYW1saWRwLmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndLAX/sAb7KLdWo9SO4Xh3+TvCNZ/IoJ
-Cbzn68TtEYJ80JJI0HedJRb0b7BvpZuBGFzml7TRVbRNmiXIKNpabhiVzDUKfRoJ
-wloFtyI5k3EvunGwxE9kvkTbMRutsclF1eCYAOGLxH8kyBbvAU9S3ouxJ+1BxeSi
-g2OM1dtUXVHKOAesJ+OaLc76HsrBaeLEEJlquDM5BUR9vIlqVswK9rqcJGkXVoyP
-vbTwj1y2GAwIuXo2JnJ5YQYiPHxBl4T/+jLasDC5bpxTd5G/z16tYuhtafy5hYr+
-elqBJUnANL+W1fYzlC9uzRtTYHqBT6VjrK0gji8toaiVr0oSeh6pxQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zYW1saWRwLmtpLnNlhiRodHRwczovL3NhbWxpZHAua2ku
-c2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC0rBm/3TPyAM04dzkXTF/iDFeHL
-MA0GCSqGSIb3DQEBBQUAA4IBAQCVEBymTnCX9oJtcbzKBE91s84dvllXnVVYxoZe
-foKBs+1z/9vNV2YC+3jS6G2Ws5NH7MNx8uhHHNcEzpoqol8fkrhtKRr1rmEjrZHj
-hJ1+DLCDLV6/rvh9/Qw1OoozKGbERMczImkB65LddYJn/HqkJNbOio2nQe1yFuxD
-e2uMNb5IldFcRQ2O1p2slZhmR8h25g64mB9xzLso7+Y+zLoGYuIild2zlQ6QOcAP
-ZHbViHEq6MAKR86+yiVaEalpQOsUOILf21GWsZiTjT70uAMx84RzjVMS0LhgxJu5
-KgetXg7iTjcWRVve8lVZNG2foRZdbmOXow95IEKdfewtfiYR
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
-
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-
- <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://samlidp.ki.se/idp/profile/Shibboleth/SSO"/>
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp.ki.se/idp/profile/SAML2/POST/SSO"/>
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-
- <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp.ki.se/idp/profile/SAML2/Redirect/SSO"/>
- </md:IDPSSODescriptor>
-
- <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <md:Extensions>
- <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
- </md:Extensions>
-
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAJRIfZUHqE36X1wo3nmAK7/a0GBrMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNhbWxpZHAua2kuc2UwHhcNMDkwNzE1MDkxNjEwWhcN
-MjkwNzE1MDkxNjEwWjAYMRYwFAYDVQQDEw1zYW1saWRwLmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndLAX/sAb7KLdWo9SO4Xh3+TvCNZ/IoJ
-Cbzn68TtEYJ80JJI0HedJRb0b7BvpZuBGFzml7TRVbRNmiXIKNpabhiVzDUKfRoJ
-wloFtyI5k3EvunGwxE9kvkTbMRutsclF1eCYAOGLxH8kyBbvAU9S3ouxJ+1BxeSi
-g2OM1dtUXVHKOAesJ+OaLc76HsrBaeLEEJlquDM5BUR9vIlqVswK9rqcJGkXVoyP
-vbTwj1y2GAwIuXo2JnJ5YQYiPHxBl4T/+jLasDC5bpxTd5G/z16tYuhtafy5hYr+
-elqBJUnANL+W1fYzlC9uzRtTYHqBT6VjrK0gji8toaiVr0oSeh6pxQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zYW1saWRwLmtpLnNlhiRodHRwczovL3NhbWxpZHAua2ku
-c2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC0rBm/3TPyAM04dzkXTF/iDFeHL
-MA0GCSqGSIb3DQEBBQUAA4IBAQCVEBymTnCX9oJtcbzKBE91s84dvllXnVVYxoZe
-foKBs+1z/9vNV2YC+3jS6G2Ws5NH7MNx8uhHHNcEzpoqol8fkrhtKRr1rmEjrZHj
-hJ1+DLCDLV6/rvh9/Qw1OoozKGbERMczImkB65LddYJn/HqkJNbOio2nQe1yFuxD
-e2uMNb5IldFcRQ2O1p2slZhmR8h25g64mB9xzLso7+Y+zLoGYuIild2zlQ6QOcAP
-ZHbViHEq6MAKR86+yiVaEalpQOsUOILf21GWsZiTjT70uAMx84RzjVMS0LhgxJu5
-KgetXg7iTjcWRVve8lVZNG2foRZdbmOXow95IEKdfewtfiYR
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
-
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-
- <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-
- <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:AttributeAuthorityDescriptor>
-
-
-
-
-<md:Organization>
- <md:OrganizationName xml:lang="en">KIOLD</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet (TEST)</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
- </md:Organization>
-<md:ContactPerson contactType="technical">
- <md:Company>Karolinska Institutet</md:Company>
- <md:EmailAddress>it-support@ki.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-ki-sll-1.0.mxml b/swamid-ki-sll-1.0.mxml
index 3b70df0d..e920050a 100644
--- a/swamid-ki-sll-1.0.mxml
+++ b/swamid-ki-sll-1.0.mxml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<md:EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-ki-sll-1.0.xml">
- <xi:include href="swamid-1.0/samlidp.ki.se.xml"/>
<xi:include href="swamid-1.0/kiidp.ki.se.xml"/>
<xi:include href="swamid-1.0/samadhi.kib.ki.se.xml"/>
<xi:include href="swamid-ki-sll-1.0/necs.sll.se.xml"/>