summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Domeij <fredrik.domeij@umu.se>2017-01-27 13:03:02 +0100
committerFredrik Domeij <fredrik.domeij@umu.se>2017-01-27 13:03:02 +0100
commitb19e8cc8030ece3367d9a913ff6881ab0b29bbb8 (patch)
treea20b0233b8c9795cbdda5b968873ef57a20585b4
parent8f0c38fc3f4c3c9c92cbdd91a6f586eddc951b2d (diff)
antagning.se cleanup
Diffstat
-rw-r--r--swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml43
-rw-r--r--swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml43
-rw-r--r--swamid-2.0/expert.test.antagning.se-ecs-sp.xml14
-rw-r--r--swamid-2.0/expert.testa.antagning.se-ecs-sp.xml59
-rw-r--r--swamid-2.0/expert.testb.antagning.se-ecs-sp.xml59
-rw-r--r--swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt62
-rw-r--r--swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt62
-rw-r--r--swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt58
-rw-r--r--swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml43
-rw-r--r--swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml43
-rw-r--r--swamid-2.0/www.antagning.se-ecs-sp.xml82
-rw-r--r--swamid-2.0/www.test.antagning.se-aws-sp.xml99
-rw-r--r--swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml101
-rw-r--r--swamid-2.0/www.testa.antagning.se-aws-sp.xml64
-rw-r--r--swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml65
-rw-r--r--swamid-2.0/www.testb.antagning.se-aws-sp.xml89
-rw-r--r--swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml65
-rw-r--r--swamid-sp-2.0.mxml14
-rw-r--r--swamid-testing-idp-1.0.mxml3
-rw-r--r--swamid-testing-sp-1.0.mxml7
20 files changed, 216 insertions, 859 deletions
diff --git a/swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml b/swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml
deleted file mode 100644
index a1d910bf..00000000
--- a/swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +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://dwidp.testa.antagning.se/dw-idp">
- <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">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJALQfyxnxGcIlMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTAeFw0xMTExMDMxNTIwNTJaFw0yMTEwMzExNTIwNTJaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDj3otRX9M3nNqyzlP3WYLM1YDP3NNJfrecwHD0zxG+Ft27z57KSK5ReMXJe563Gv88MUYP7xXuxZrYYYZMfjLhAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD5/eg5m7hEbBTQjGM4VVhAer70vMFMGA1UdIwRMMEqAFD5/eg5m7hEbBTQjGM4VVhAer70voSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQC0H8sZ8RnCJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAj0sRR5pI/THUnP4Ywnfl9mjQ6BMu5nJG4m3zHaRj3wkeGhNRFgHDHk2YQtMqOMjC3PwarQgIl7cRLYPFhyiP+g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testa.antagning.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://dwidp.testa.antagning.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testa.antagning.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">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJALQfyxnxGcIlMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTAeFw0xMTExMDMxNTIwNTJaFw0yMTEwMzExNTIwNTJaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDj3otRX9M3nNqyzlP3WYLM1YDP3NNJfrecwHD0zxG+Ft27z57KSK5ReMXJe563Gv88MUYP7xXuxZrYYYZMfjLhAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD5/eg5m7hEbBTQjGM4VVhAer70vMFMGA1UdIwRMMEqAFD5/eg5m7hEbBTQjGM4VVhAer70voSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQC0H8sZ8RnCJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAj0sRR5pI/THUnP4Ywnfl9mjQ6BMu5nJG4m3zHaRj3wkeGhNRFgHDHk2YQtMqOMjC3PwarQgIl7cRLYPFhyiP+g==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testa.antagning.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>
- </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml b/swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml
deleted file mode 100644
index 00c674a1..00000000
--- a/swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml
+++ /dev/null
@@ -1,43 +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://dwidp.testb.antagning.se/dw-idp">
- <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">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJAK9IwIV5pteUMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RiLmFudGFnbmluZy5zZTAeFw0xMTA4MzExMjQyMTBaFw0yMTA4MjgxMjQyMTBaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RiLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDGr4pLVe1btwLMC6MBsh6/lhDXbNmEQ3QAC2rh2gNEyhyiQJwNcqnOtYc1haC+mVrRI4MfB9z+KHfLiWsK14vBAgMBAAGjgYUwgYIwHQYDVR0OBBYEFLD+o7ou3DNUH3EL+Ya2AbYNlAANMFMGA1UdIwRMMEqAFLD+o7ou3DNUH3EL+Ya2AbYNlAANoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCvSMCFeabXlDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAdceJ/0JThcaLw3Y+0roaVpdFBVMSUzFWYc0Y2d+PxNXGCiC3R5vUdpc/8bjX49zf4cEs8BLEazPX0GL4CePksw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testb.antagning.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://dwidp.testb.antagning.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testb.antagning.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testb.antagning.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">dwidp.antagning.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIBxTCCAW+gAwIBAgIJAK9IwIV5pteUMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RiLmFudGFnbmluZy5zZTAeFw0xMTA4MzExMjQyMTBaFw0yMTA4MjgxMjQyMTBaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RiLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDGr4pLVe1btwLMC6MBsh6/lhDXbNmEQ3QAC2rh2gNEyhyiQJwNcqnOtYc1haC+mVrRI4MfB9z+KHfLiWsK14vBAgMBAAGjgYUwgYIwHQYDVR0OBBYEFLD+o7ou3DNUH3EL+Ya2AbYNlAANMFMGA1UdIwRMMEqAFLD+o7ou3DNUH3EL+Ya2AbYNlAANoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCvSMCFeabXlDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAdceJ/0JThcaLw3Y+0roaVpdFBVMSUzFWYc0Y2d+PxNXGCiC3R5vUdpc/8bjX49zf4cEs8BLEazPX0GL4CePksw==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testb.antagning.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>
- </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/expert.test.antagning.se-ecs-sp.xml b/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
index 1a147fd4..8d531ff9 100644
--- a/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.test.antagning.se/ecs-sp">
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -18,7 +22,7 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.or g/entity-category">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
<samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
</samla:Attribute>
@@ -27,6 +31,14 @@
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
<md:Extensions>
<init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.test.antagning.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">NyA-webben (test)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">NyA-webben (test)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Antagning.se är sajten för anmälan till universitet och högskolor.</mdui:Description>
+ <mdui:Description xml:lang="en">Apply online to Swedish universities and university colleges.</mdui:Description>
+ <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+ <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml b/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml
deleted file mode 100644
index d5cfe3a0..00000000
--- a/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.testa.antagning.se/ecs-sp">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.testa.antagning.se/Shibboleth.sso/Login"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.testa.antagning.se/ecs-sp/ecs-sp</ds:KeyName>
- <ds:KeyName>www.testa.antagning.se/ecs-sp</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.testa.antagning.se/ecs-sp</ds:X509SubjectName>
- <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAN9+3w1NvcgcMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXd3dy50ZXN0YS5hbnRhZ25pbmcuc2UvZWNzLXNwMB4XDTExMTEwMzEzMTQ1
-NVoXDTIxMTAzMTEzMTQ1NVowKDEmMCQGA1UEAxMdd3d3LnRlc3RhLmFudGFnbmlu
-Zy5zZS9lY3Mtc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF7h+p
-lY+XKnA9Fpo9hWxEadSxDIrehClAuix4Sq9jqaOXJSnFLsoKkuXUPOeifRKliN1M
-1OAUBzSkmLsU9pmQLGPePhsibeZ2QzRmvvRwtRnFQz/v6XqBa9aBuANeiXlSbiGD
-NQcf2DhU2Ecf172x4HxAhUzTXpgRBTJMaY2AIQHLiW+qjNWd5aBrDeLzSO1M4+AW
-2Dxb1q+UHFwQCRapZiAetaRFiAYj7+riHXv+QimWr07BIYuzxxGjYp6UxZtC081f
-A+59xZlhvELu/NILFCOxK0AV5ekjo1CWE4M3gLG8ElXksPHw9h92IbFA+XxII4yl
-bo2BRjrjxeq6hOFBAgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy50ZXN0YS5hbnRh
-Z25pbmcuc2UvZWNzLXNwhixodHRwczovL3d3dy50ZXN0YS5hbnRhZ25pbmcuc2Uv
-ZWNzLXNwL2Vjcy1zcDAdBgNVHQ4EFgQUYydACh1g3sJY0QqJpPm6Aes14AgwDQYJ
-KoZIhvcNAQEFBQADggEBABgXRYqiJggINk9GwoDrmHDFFJsZkolVggcxGXajm21J
-L7lmQ/egl0wMh4b94XWt6LhSH14C/EVQ7biakVwtqNvSoNEpLNcHb2CXKlD3zI+N
-Jz+BWFQmKIob2Mz4Jq7zvz6FRRM4I8OPJgL2n9DxkjtvPdQxKEU8J8CQbm18O+T9
-BJxep5toe7CwjX6G7w8/nvyAJhbF2Y8JEbhdE87k6lOY9w3gfePPsCFZaxHIsxJ1
-l4ZGva1/3LErE+yBLMlq0btsJ3xN1WH0GndIDbKBEUybliI0YthExktB854JHFXG
-KpzNWnJjueWGyd3A1bNfLKm5zayFB1wNyPe5uKnSX5Q=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testa.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testa.antagning.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testa.antagning.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testa.antagning.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testa.antagning.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testa.antagning.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testa.antagning.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testa.antagning.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testa.antagning.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml b/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml
deleted file mode 100644
index e085bce8..00000000
--- a/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.testb.antagning.se/ecs-sp">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.testb.antagning.se/Shibboleth.sso/Login"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>expert.testb.antagning.se/ecs-sp</ds:KeyName>
- <ds:KeyName>https://expert.testb.antagning.se/ecs-sp/ecs-sp</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=expert.testb.antagning.se/ecs-sp</ds:X509SubjectName>
- <ds:X509Certificate>MIIDWDCCAkCgAwIBAgIJAOx7DRVE49sHMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-BAMTIGV4cGVydC50ZXN0Yi5hbnRhZ25pbmcuc2UvZWNzLXNwMB4XDTExMDkyODEz
-NDQxM1oXDTIxMDkyNTEzNDQxM1owKzEpMCcGA1UEAxMgZXhwZXJ0LnRlc3RiLmFu
-dGFnbmluZy5zZS9lY3Mtc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDCYpAvcP4rcL/ykBE9V8kSDOlo9Zr+vxgzGQXfs8p2r/TnJJCYPovuVkGVTAfu
-jx2k5cEULzrH0/Ulfg08mWIo7oSUC4rwvrgfYmoLiEZ5fYCtsO3Ah+xzRYgar62N
-9fmXqvhkRfXrCHLHrDyzxue1DidfaorYAfAppMeU2qtlWGFy7djoFemRH3ZGBv44
-MLpjVGdrFlFlU4r0gF+CYKxRPe5EsLS97txWOMbfBV3cWIpUFWgHZXz6eDCwxvaH
-PJiL+ITxvy3/7H+dQ7emWkjOCD2B/hMC1cVN+qsJcbtxY1MYtWTPW7EXIfosO+ws
-xQznRPgqU4mp0zmDUQHFhL+9AgMBAAGjfzB9MFwGA1UdEQRVMFOCIGV4cGVydC50
-ZXN0Yi5hbnRhZ25pbmcuc2UvZWNzLXNwhi9odHRwczovL2V4cGVydC50ZXN0Yi5h
-bnRhZ25pbmcuc2UvZWNzLXNwL2Vjcy1zcDAdBgNVHQ4EFgQUNq5ePJm8LHbRzbUl
-Frb2PF1iG8gwDQYJKoZIhvcNAQEFBQADggEBAEdCaJ8KkVzQ93hYi5Lf1ODQ9W45
-f0mdQnML3Gkfft2RvmKuS9iUoFz5N/kLATY+60lzHYGLuoqMy2N6urcRbt9Ocsi7
-q9DhXQRpRYGtni5mu8bfPlzpyJunBhcUmUWGQP/smCpS8g4i63CMpXn7VNyN3NJW
-DM76OjYz/sAlKD7IN6ihFwi1Coh3VTcWWvi0bHy8fMlhoNBGwLa+BuDxVwodMmrY
-1wRPvBgfBwmv+Jj8bbd0IUOnw1gHAr4HwlvKQ0ZpjCbDfAu33EkYqc+OizGceP8s
-6719fw5PgpM3v/FwSB0ohRs6M0Ed5TV8EvR29RB9XyGUxx77tOo593X4uRo=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testb.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testb.antagning.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testb.antagning.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testb.antagning.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testb.antagning.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testb.antagning.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testb.antagning.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testb.antagning.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testb.antagning.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testb.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://expert.testb.antagning.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testb.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.testb.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testb.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testb.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt b/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt
deleted file mode 100644
index a0d9e0da..00000000
--- a/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_d2986734dcdc5674ace6fe12d153beec095ab2e8" entityID="https://expert.uhrdemo.antagning.se/aws-sp-en">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/Login"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>expert.uhrdemo.antagning.se</ds:KeyName>
- <ds:KeyName>https://expert.uhrdemo.antagning.se/aws-sp-en</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=expert.uhrdemo.antagning.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDRzCCAi+gAwIBAgIJAJfxsCaOWkxRMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZTAeFw0xNDEwMjAxMjUzMTha
-Fw0yNDEwMTcxMjUzMThaMCYxJDAiBgNVBAMTG2V4cGVydC51aHJkZW1vLmFudGFn
-bmluZy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANDwqlMZ9iz5
-VJANM6co6vl//O6rIjhm/dbqwqwPWRUQJEi9a3wp47tpCraKfAd2iIjsTa3+dvuc
-jvIuxp355ZOe9wkXADkeqpdD3HqxgRMf31v1zxd6ABeaBmmFLihSTShmrf69wvTN
-aaU2N0pXUCTM6prEQ/EOMvk7kxFJOTf2ciELWCGAO+bcLoTZ8pXnKZ1hze9vUGJy
-9SSAq4gDgzB2yKRV2UwXRCYUthcewb0RlejYtJkJlu21XzJKo5A+CIx7DEj66ZOG
-fk8OdrTVtKZTqzZD2yl7F82yIoo1UCFkVWSmUDj1ObXEzI5x940UoYr0twwQ5jMg
-/AmOdFBD/qkCAwEAAaN4MHYwVQYDVR0RBE4wTIIbZXhwZXJ0LnVocmRlbW8uYW50
-YWduaW5nLnNlhi1odHRwczovL2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZS9h
-d3Mtc3AtZW4wHQYDVR0OBBYEFKCp9bZIbKEPAefJavvCWNo4ZbQDMA0GCSqGSIb3
-DQEBBQUAA4IBAQCa8NZ091egdPM83IaUIIBBCQjWWkynQWC5mANETQ3kkNOk0+Ex
-W+DnlOpzRUf0zgsDFnyaGxX2AUWwldzUPE1Sbx8iGxMrlvRFgsRIIhgvcs4g27Fz
-R9x/WVKJnAO3RIkIBmAcN/fpnoxNUiSnM3CumjuTWzOUPXlpRApoXvfLeBOdNljL
-uCP0zpdAAilt9SIJtPY16GGUxf3Q7MLtXM6wlMMwTwNFqybbLED1h5sWWzgy6f2L
-o5gjWAsejZSBtsnrDMnIiVxmpC0lRAs01YZNzubAE/4nOgK0UkDcUvKRe71maUng
-t73BO6E9LjRk4iDy6Je9FYTwCAosy3V6dZxD
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt b/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt
deleted file mode 100644
index 76635998..00000000
--- a/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_310466456749a09f87bb3835cdc60263e7d05e48" entityID="https://expert.uhrdemo.antagning.se/aws-sp">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/Login"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>expert.uhrdemo.antagning.se</ds:KeyName>
- <ds:KeyName>https://expert.uhrdemo.antagning.se/aws-sp</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=expert.uhrdemo.antagning.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDRDCCAiygAwIBAgIJALz2sBBLqMf6MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZTAeFw0xNDEwMjAxMzQ1MzNa
-Fw0yNDEwMTcxMzQ1MzNaMCYxJDAiBgNVBAMTG2V4cGVydC51aHJkZW1vLmFudGFn
-bmluZy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALbOIRmxfwWb
-yMkMOPODCqatRVJtc0eEDa5JCTcv03K+Ctrm0ERm1tfFpgRyBMp4gTFlAb6x/sUQ
-Y0LOsbupRN4jy9zLYYTMGDZtPclKWTmeYghYnVYk4uDNqRZhPoQ5jThb1ZN1cF6a
-EPde+GqpLNP/6vSlkmTb8fQMR+jTiAHIar5wgjrdy71czFrVNzLvE6aeAAj1Ltgo
-OpRkvUvv6tJvGNy/zIDWMCwXOp2g19c1fjsv9cGZDOzXUDDkDKp64yTAYVW7JlAX
-9e0mP5Y7cMVAbrygaoPqZWpuRIrLXm09rHXO1IwZr84FvslzMPga/AeUHuEOaPId
-4PqGc6M4k88CAwEAAaN1MHMwUgYDVR0RBEswSYIbZXhwZXJ0LnVocmRlbW8uYW50
-YWduaW5nLnNlhipodHRwczovL2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZS9h
-d3Mtc3AwHQYDVR0OBBYEFDvjW1sTBeDuIGWsbEZD/P/16bwnMA0GCSqGSIb3DQEB
-BQUAA4IBAQBSlW+rxm2rcJuJrKWcrosdHV2NvebZs7hEofN2HFVc6N4i1mT72p6i
-zysIRUq+w9kJJO8DZMHnp2/jijg1zheWOmazsbNW1oEJX3xp9PCT6chxWepZpLjg
-jGJgC6cCj5y+m7QKTIwVeqwzPJbDfcN2B3IXaplfuBG4psDoTYlirymCRQQtSewY
-peixelFpX7cxoKJriN2mIV9KnCyfNJIAe+fmUHhqBZKVsz1m72jr7dtbMPo6Mo8Z
-PsIf/yVavv75z7lQcOvuV3H8wECX4rTZV860ByFV6hSCYSpS7/L5M8SD2vyhhJUs
-06JLG6j3mY0H9dW9Ty9RzPYf97RSHj4k
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt b/swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt
deleted file mode 100644
index 478869bf..00000000
--- a/swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0e9ed0f1e6a055f7e5a5c89de7b073cf4b660fad" entityID="https://expert.uhrdemo.antagning.se/ecs-sp">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/Login"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>expert.uhrdemo.antagning.se</ds:KeyName>
- <ds:KeyName>https://vhs501.logica.se/ecs-sp</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=expert.uhrdemo.antagning.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIJAM+Qwbl5eGuwMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZTAeFw0xNDEwMjAxMzE2MjRa
-Fw0yNDEwMTcxMzE2MjRaMCYxJDAiBgNVBAMTG2V4cGVydC51aHJkZW1vLmFudGFn
-bmluZy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANuM/WLyOlj6
-KNf5FzyIDpe9c5l9LPN28IDacvUyPjxnU2qRfaIMEK45+mhH7UiLvGK9kXLfr3d8
-mUicmUnAjQlRB2T7953J1f2KWW2afHfW/rH0fC5C9sWNBrGAcmOAWaBpc/MDympu
-6mJdGQjhmehpNAueBakh2YaEgs50hiWWttKnrPtl4RQ0qXfCuKQhy+bxa0DjGVTD
-eWuDNQxFrxaTAPQiUf6386G+vbAOjRvyq0UDNBrkg9yb5knHv0XfCKGi7rOapHIu
-hWi7dYDfHh4Lc0SIX43Hkublda+/nzCjT52im1x6wRC/jGTFfhCW3IX8QL8ANCJQ
-RGtXNgIiFOECAwEAAaNqMGgwRwYDVR0RBEAwPoIbZXhwZXJ0LnVocmRlbW8uYW50
-YWduaW5nLnNlhh9odHRwczovL3ZoczUwMS5sb2dpY2Euc2UvZWNzLXNwMB0GA1Ud
-DgQWBBSHWa+2Jop2CpGUr06qtCQnqlusDzANBgkqhkiG9w0BAQUFAAOCAQEAHRQt
-IlgweHsTUN2eYDdZ0gN0E16GxzorMbLGfFQkqNaY7CvXj0WjOPrUnPGYEAw9XnF1
-SITKiZj9qLLBqx5K/agKuudhAFdDTMqJWY5Rw2PBk9Io4AJRwGfeEkkmMTEQolyI
-fN5Rwcz/3w84SQiJ2WVhS6CA+fNmKYnF0sfdyMnpSMWIkigoiFOFDkNr/WOT9r6G
-ElWOLHyh8jwJJgKIRA/EMVGtYinP8otUp1JO2wluG5xGNYtlP2RzBRC41iWCw+MU
-d0GThiLcDn9khv9UmyYHuG5uUaN+1z/XCmQGMNQD50MR/NQFupaKlHMmb+bYLc7S
-rlE8uHfQTinDQ9HpOw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
deleted file mode 100644
index b022d5a9..00000000
--- a/swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +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://shibboleth.testa.antagning.se/shibboleth-idp">
- <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">antagning.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDXjCCAkagAwIBAgIJAMHRqVVIomVvMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTE0MTEyNzA5MTA1NVoXDTI0MTEyNDA5MTA1NVowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIS7eaTNDBfXVdFzHbmALSP/R9gmoA3LSXP50MVMFtXP+aLQjPOszxo3PddkR88VHt+wLCTM4Tl++ohTeLZrOiQUPhHCAjuaIrRmlps0bdPgbtLGGD0xPMTvigZQBDLVKsoUQwZw0mS4vFUn2g2hil0XA5CAmo08/SkN29FaHbptJvpTE/MRXBzQkWPwuKEvPTK8dP616EIaeLYieohocR7wz5dgxlkMNH01NyNNfI8qFJEa6dRezucinX3QRJRIzpYSwqMigJqWYwzhsOTc4/lJhUQYEFqmWMq9JdV07vx67rrkVDUc+ec1QW5rEvZe2CLSX6nCrf9okl9NHuboiRAgMBAAGjgYowgYcwHQYDVR0OBBYEFJwj3QI8gIa+itqOZxbOdea5alfuMFgGA1UdIwRRME+AFJwj3QI8gIa+itqOZxbOdea5alfuoSykKjAoMSYwJAYDVQQDEx1zaGliYm9sZXRoLnRlc3RhLmFudGFnbmluZy5zZYIJAMHRqVVIomVvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJgUPL1Rpj6hIH3fmYB6YxKO31OOXUurhwuteQ7T2SK8l2koIdsRbNsk0gwtqkDOsjCq3XhFUhDdhM48v+m1c8JvpbSrj/OI1GrsVL5TFSNe5WnO+aqc/qH+Km/WkHXcWTQreu9HSFNzMdSLC4dNoOMKJa5Ai6QpqPUBzFwjWS31WxsGVGQYFJmeRD4YeWzfvilNQUUoJdceSDiadegp5EWDQeZchM2G5KfqMZ5pCvPY4cTal0+yKE8USB+QrSjkIHAoUf58U0fvVD2daD2fn+uAQpiEvKfx04jJIvMZOg2dBUfLUgaRxWP6NE48vvBMK37K6tB+NmPlzLYgzWO/P5Y=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testa.antagning.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://shibboleth.testa.antagning.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testa.antagning.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">antagning.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDXjCCAkagAwIBAgIJAMHRqVVIomVvMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTE0MTEyNzA5MTA1NVoXDTI0MTEyNDA5MTA1NVowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIS7eaTNDBfXVdFzHbmALSP/R9gmoA3LSXP50MVMFtXP+aLQjPOszxo3PddkR88VHt+wLCTM4Tl++ohTeLZrOiQUPhHCAjuaIrRmlps0bdPgbtLGGD0xPMTvigZQBDLVKsoUQwZw0mS4vFUn2g2hil0XA5CAmo08/SkN29FaHbptJvpTE/MRXBzQkWPwuKEvPTK8dP616EIaeLYieohocR7wz5dgxlkMNH01NyNNfI8qFJEa6dRezucinX3QRJRIzpYSwqMigJqWYwzhsOTc4/lJhUQYEFqmWMq9JdV07vx67rrkVDUc+ec1QW5rEvZe2CLSX6nCrf9okl9NHuboiRAgMBAAGjgYowgYcwHQYDVR0OBBYEFJwj3QI8gIa+itqOZxbOdea5alfuMFgGA1UdIwRRME+AFJwj3QI8gIa+itqOZxbOdea5alfuoSykKjAoMSYwJAYDVQQDEx1zaGliYm9sZXRoLnRlc3RhLmFudGFnbmluZy5zZYIJAMHRqVVIomVvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJgUPL1Rpj6hIH3fmYB6YxKO31OOXUurhwuteQ7T2SK8l2koIdsRbNsk0gwtqkDOsjCq3XhFUhDdhM48v+m1c8JvpbSrj/OI1GrsVL5TFSNe5WnO+aqc/qH+Km/WkHXcWTQreu9HSFNzMdSLC4dNoOMKJa5Ai6QpqPUBzFwjWS31WxsGVGQYFJmeRD4YeWzfvilNQUUoJdceSDiadegp5EWDQeZchM2G5KfqMZ5pCvPY4cTal0+yKE8USB+QrSjkIHAoUf58U0fvVD2daD2fn+uAQpiEvKfx04jJIvMZOg2dBUfLUgaRxWP6NE48vvBMK37K6tB+NmPlzLYgzWO/P5Y=
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testa.antagning.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>
- </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml
deleted file mode 100644
index 5b257d92..00000000
--- a/swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml
+++ /dev/null
@@ -1,43 +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://shibboleth.testb.antagning.se/shibboleth-idp">
- <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">antagning.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAKDyv/rU4+J6MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGIuYW50YWduaW5nLnNlMB4XDTExMDgzMTEyMzQzMloXDTIxMDgyODEyMzQzMlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuqMDiczO1Gj3DfxLSCMhryHFqPNYnvqBkqJQu7R5DjxM1IZndC5lIJTgIHT2e2htm50UilyPsu5SeH81xJg22QIDAQABo4GKMIGHMB0GA1UdDgQWBBRcMizYbSEJJ91KF8VB4WnEyksWdjBYBgNVHSMEUTBPgBRcMizYbSEJJ91KF8VB4WnEyksWdqEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCg8r/61OPiejAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EACQ/hKeQVaP5+pq6LQCcV20uP8M7Y+fbCQmgPioetyQwI6+BbxMkhgTbDvPYs7/y8y/hfo8RYCsmfA4SoVEQr9w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testb.antagning.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://shibboleth.testb.antagning.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testb.antagning.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">antagning.se</shibmd:Scope>
- </Extensions>
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIB1DCCAX6gAwIBAgIJAKDyv/rU4+J6MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGIuYW50YWduaW5nLnNlMB4XDTExMDgzMTEyMzQzMloXDTIxMDgyODEyMzQzMlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuqMDiczO1Gj3DfxLSCMhryHFqPNYnvqBkqJQu7R5DjxM1IZndC5lIJTgIHT2e2htm50UilyPsu5SeH81xJg22QIDAQABo4GKMIGHMB0GA1UdDgQWBBRcMizYbSEJJ91KF8VB4WnEyksWdjBYBgNVHSMEUTBPgBRcMizYbSEJJ91KF8VB4WnEyksWdqEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCg8r/61OPiejAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EACQ/hKeQVaP5+pq6LQCcV20uP8M7Y+fbCQmgPioetyQwI6+BbxMkhgTbDvPYs7/y8y/hfo8RYCsmfA4SoVEQr9w==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testb.antagning.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>
- </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/www.antagning.se-ecs-sp.xml b/swamid-2.0/www.antagning.se-ecs-sp.xml
deleted file mode 100644
index 79886fde..00000000
--- a/swamid-2.0/www.antagning.se-ecs-sp.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.se/ecs-sp">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.antagning.se/ecs-sp</ds:KeyName>
- <ds:KeyName>www.antagning.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.antagning.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJALH2RsMw05H0MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHd3dy5hbnRhZ25pbmcuc2UwHhcNMTEwMTI3MTU0NTQzWhcNMjEwMTI0MTU0
-NTQzWjAbMRkwFwYDVQQDExB3d3cuYW50YWduaW5nLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAo0zS8/OY0J8MaPznZX+4vVWnGKTR1SDd4euzuQo/
-Kq+JDCb3T+r4/9JQ21kXSVeU15F9JimK1Le+RiTNw/S0j/7GME+74kUnvaVCCHof
-2wCwdu1opbHSnuubuvFpq/09vzrJx+BnJKCaAkTtFQWptaPgP8X8dl+uIfBk1XnP
-W8G2ks9kxBDLDgaeLsw9XVVmvx2agQ+DvyLCweV65EzkyE5Q0E3lNB3o/7bbFwks
-ylF0ck83sZs0xZmGZGSJA/3Nq0DY9WQqzuzzRN/EE8tMlzzBtBPFO+8UXfVcGNrE
-Ji05WLEotSz7J7isienC7ZGeFSgL4RUZ8yD3smzs3pywQwIDAQABo18wXTA8BgNV
-HREENTAzghB3d3cuYW50YWduaW5nLnNlhh9odHRwczovL3d3dy5hbnRhZ25pbmcu
-c2UvZWNzLXNwMB0GA1UdDgQWBBRcKrtBUd27dOJHOQu/XU22WJXa1TANBgkqhkiG
-9w0BAQUFAAOCAQEAnWdP39natg/Qa/8/3EKsPsriH3sUdX2gDFqUjPEOLX+eDhT8
-6TKl3q6nEhpe+Zgb+ER08TSEp+BrBtAR/SG+Du4Lni7Jo8d7sgJe4oUxvnQOuaPH
-GosRhbRqhfHL0Ww8w0x7V/KRQkupwcXNQ4gga9dy2uZQjg/UK45r3ii5XUogzfVJ
-EclAXOodZ846vzq972yn0Uwn2YsZo/3po42QF5aw2YRjxxN7XIaWshKrv9r82voj
-VJd+cPOTem5oBZpfu5nzSrDRGdKYqO2W0Y9kesTFue14NutKgjXaPLdUNFNhGB7b
-memQErWscT6OYxV3jxV31wEP2PzMsYzF5LXJEQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.antagning.se/ecs-sp</ds:KeyName>
- <ds:KeyName>www.antagning.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.antagning.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJALH2RsMw05H0MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHd3dy5hbnRhZ25pbmcuc2UwHhcNMTEwMTI3MTU0NTQzWhcNMjEwMTI0MTU0
-NTQzWjAbMRkwFwYDVQQDExB3d3cuYW50YWduaW5nLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAo0zS8/OY0J8MaPznZX+4vVWnGKTR1SDd4euzuQo/
-Kq+JDCb3T+r4/9JQ21kXSVeU15F9JimK1Le+RiTNw/S0j/7GME+74kUnvaVCCHof
-2wCwdu1opbHSnuubuvFpq/09vzrJx+BnJKCaAkTtFQWptaPgP8X8dl+uIfBk1XnP
-W8G2ks9kxBDLDgaeLsw9XVVmvx2agQ+DvyLCweV65EzkyE5Q0E3lNB3o/7bbFwks
-ylF0ck83sZs0xZmGZGSJA/3Nq0DY9WQqzuzzRN/EE8tMlzzBtBPFO+8UXfVcGNrE
-Ji05WLEotSz7J7isienC7ZGeFSgL4RUZ8yD3smzs3pywQwIDAQABo18wXTA8BgNV
-HREENTAzghB3d3cuYW50YWduaW5nLnNlhh9odHRwczovL3d3dy5hbnRhZ25pbmcu
-c2UvZWNzLXNwMB0GA1UdDgQWBBRcKrtBUd27dOJHOQu/XU22WJXa1TANBgkqhkiG
-9w0BAQUFAAOCAQEAnWdP39natg/Qa/8/3EKsPsriH3sUdX2gDFqUjPEOLX+eDhT8
-6TKl3q6nEhpe+Zgb+ER08TSEp+BrBtAR/SG+Du4Lni7Jo8d7sgJe4oUxvnQOuaPH
-GosRhbRqhfHL0Ww8w0x7V/KRQkupwcXNQ4gga9dy2uZQjg/UK45r3ii5XUogzfVJ
-EclAXOodZ846vzq972yn0Uwn2YsZo/3po42QF5aw2YRjxxN7XIaWshKrv9r82voj
-VJd+cPOTem5oBZpfu5nzSrDRGdKYqO2W0Y9kesTFue14NutKgjXaPLdUNFNhGB7b
-memQErWscT6OYxV3jxV31wEP2PzMsYzF5LXJEQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.antagning.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.antagning.se-aws-sp.xml b/swamid-2.0/www.test.antagning.se-aws-sp.xml
new file mode 100644
index 00000000..6b3917bd
--- /dev/null
+++ b/swamid-2.0/www.test.antagning.se-aws-sp.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.test.antagning.se/aws-sp">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ </samla:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
+ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.test.antagning.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Antagning.se (test)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Universityadmissions.se (test)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Antagning.se är sajten för anmälan till universitet och högskolor.</mdui:Description>
+ <mdui:Description xml:lang="en">Apply online to Swedish universities and university colleges.</mdui:Description>
+ <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+ <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.test.antagning.se/aws-sp</ds:KeyName>
+ <ds:KeyName>www.test.antagning.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.test.antagning.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJALgFaZxRpZGtMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFXd3dy50ZXN0LmFudGFnbmluZy5zZTAeFw0xNTExMzAxMDAxMzdaFw0yNTEx
+MjcxMDAxMzdaMCAxHjAcBgNVBAMTFXd3dy50ZXN0LmFudGFnbmluZy5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgOxkDhDOd2xZU5vSnjRvK+Fqh7
+A2hpkF4BkPDBISZN+GT6WP6GzP8HTrQew055l+rd6wDTXHiGySE61NLhzfoXn4Pr
+g3yt4fQANcURScFDrK8CHkhmMK97FKEtPhELn4iuNAA7QwjONvFD5nMvb/PdAYWf
+MjqJUC/IIUIaHc67ntTJ96qBlSdYGjqS0Rz++ehuxpIFxeAogua8NxLVY4PPQiZP
+jpsXSo6HotsqyLXOaawS4iIk7CcQtYdtm4IW+b8MzG8Ufzomybrzfjnbe94ofbWH
+YceoVPng+CM2I5lHjTls1pp5dGC1vrc0PhiHdVrkx1QplEM9mO95kPXB9+cCAwEA
+AaNpMGcwRgYDVR0RBD8wPYIVd3d3LnRlc3QuYW50YWduaW5nLnNlhiRodHRwczov
+L3d3dy50ZXN0LmFudGFnbmluZy5zZS9hd3Mtc3AwHQYDVR0OBBYEFDW1EVRqDlsl
+x5wgXmWEqPBLjTB6MA0GCSqGSIb3DQEBBQUAA4IBAQA2N/FbFcVVBUlMHxTdJkv7
+LtPe2dAiCc3v1MbYbWifhtSqLDTCUsjh5T0neqS3zY/o8yR+YFwG5kW7cEBV15K1
+zty3Ng75prH0Dx/37Wh5xp7Jo5ddJq9rjTw97oFP4x8PTlXsDNweI44WSxFypgVu
+78PREhA/UB4qnCz0p6MnkFICnIRFL/8yGdOSz2BYbYEYRVZiv04WVL3KcgfIiHDL
+WU29UXUAHkP7lcq1Oexz5A/+2ZIV3Eh8z60CuqwhHqEgOeJcFW2EJI+dVBW84yJo
+bvHeqsH+7VWUjhwDn2x9PawkZ9FWZubyy+4+TPP1leZRo3TGKCn6WOgk22watDPt
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.antagning.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.antagning.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.antagning.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.antagning.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.antagning.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.antagning.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.antagning.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.antagning.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
new file mode 100644
index 00000000..76d4f6c6
--- /dev/null
+++ b/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.test.universityadmissions.se/aws-sp-en">
+ <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+ <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+ </samla:Attribute>
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
+ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+ <md:Extensions>
+ <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.test.universityadmissions.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Antagning.se (test)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Universityadmissions.se (test)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Antagning.se är sajten för anmälan till universitet och högskolor.</mdui:Description>
+ <mdui:Description xml:lang="en">Apply online to Swedish universities and university colleges.</mdui:Description>
+ <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+ <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.test.universityadmissions.se/aws-sp-en</ds:KeyName>
+ <ds:KeyName>www.test.universityadmissions.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.test.universityadmissions.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDXTCCAkWgAwIBAgIJANVtgy+AlI7nMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+BAMTIHd3dy50ZXN0LnVuaXZlcnNpdHlhZG1pc3Npb25zLnNlMB4XDTE1MTEzMDEw
+MTYwNFoXDTI1MTEyNzEwMTYwNFowKzEpMCcGA1UEAxMgd3d3LnRlc3QudW5pdmVy
+c2l0eWFkbWlzc2lvbnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDGu3w8pwnL2fBBVZHtnUQjmA4Lkyu9KlAwJm+syhCGg/RCx7UmaBHZ7tNnKmGp
+YHF80SfaNKm/CrYuBWDOw3a+xHn192HnpznN1H68TnlnRZgA3uSd12yFrloSUfNd
+Cj2g8FVMCiP1aJKZFntOjki1CCU9PAUf44OgsRkp2pNqpgphc5gu1OnEQkU+zfbs
+RCN8tyTaWcuMBxb0rj2clPKWhPDjYA8u/6IYd6XqAfqEdMYU51JW6wGsK++Yvz1J
+XIdQmwWtANGQPx8S7M2iKv3xr/LRXSD79wzuPtIod1vywKJWzUZxZA969iM/fqVB
+CaNQ1KTcDVbt8qw2CkMqRurPAgMBAAGjgYMwgYAwXwYDVR0RBFgwVoIgd3d3LnRl
+c3QudW5pdmVyc2l0eWFkbWlzc2lvbnMuc2WGMmh0dHBzOi8vd3d3LnRlc3QudW5p
+dmVyc2l0eWFkbWlzc2lvbnMuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSmo8C/48yw
+f0RAS/CKET3cDyY/FjANBgkqhkiG9w0BAQUFAAOCAQEAsBBZkBpUtUv3An56mDMi
+ZsNP4G9F5AAOTa8v2HZKCeuuuT13kWwRZ74f/FO95VVSx9E3ux8916yH2qsvCuY7
+WVQLyXUBKdrH+M0RHwKF0MGa9j7/nY+U61djm2CLUTNurE27l9HP61+4yW1PehSt
+3nMV1F7TPexokVy67dRaX5sPouVWYui+B2dfABul+RCGZUoBLcuZiXGaZpFO4oRd
+tmv9bWX4NeQ4UXpBOUXq/Ln697acX91xQAaPjMJdlndxRVFIzY55FTG0F2RHYQXF
+QscDiFxPlcLA7uNrotilYza1gFr0bYITxjlWmixDem8isZqOSmOz3ygvf1Qf2KKt
+Zw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+ <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.universityadmissions.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.universityadmissions.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.universityadmissions.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.universityadmissions.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.universityadmissions.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.testa.antagning.se-aws-sp.xml b/swamid-2.0/www.testa.antagning.se-aws-sp.xml
deleted file mode 100644
index ab08ad17..00000000
--- a/swamid-2.0/www.testa.antagning.se-aws-sp.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testa.antagning.se/aws-sp">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testa.antagning.se/Shibboleth.sso/Login"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.testa.antagning.se/aws-sp/aws-sp</ds:KeyName>
- <ds:KeyName>www.testa.antagning.se/aws-sp</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.testa.antagning.se/aws-sp</ds:X509SubjectName>
- <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJALhHdWlTdPORMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXd3dy50ZXN0YS5hbnRhZ25pbmcuc2UvYXdzLXNwMB4XDTExMTEwMzEzMTQw
-M1oXDTIxMTAzMTEzMTQwM1owKDEmMCQGA1UEAxMdd3d3LnRlc3RhLmFudGFnbmlu
-Zy5zZS9hd3Mtc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvjfZK
-UCha0m0sDBe9pVL/YY9gbWAspd363rlCEaFyY481s2lYX8gXPgC/bFD8WT7XAKxa
-tYjX3ju6q4Jw/ZKdwnd3u3V9uVWSgwmc8BGAdV/WP2y5mSU9EJyTPWWBTqK50wPm
-CnTrLZqoAsWIywR5R9xusYZf8IjeOSv9ojF9yvp5+m6teGLbN8j0/CRg2SCyQkmi
-tW+QZgkwbGz8X6hvMDoOR8ViNBEZFHPDoGJvyl0SowAUvGCQ12YR8wfXBB59juFL
-E+33WgyWEEfFc+skHA0LRsHvzyQ33wRHi7wMTaSu6WlxG7lzgxzfKzJpS6RoGwmP
-sGFRskXDDYavCR4xAgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy50ZXN0YS5hbnRh
-Z25pbmcuc2UvYXdzLXNwhixodHRwczovL3d3dy50ZXN0YS5hbnRhZ25pbmcuc2Uv
-YXdzLXNwL2F3cy1zcDAdBgNVHQ4EFgQUZ+hrnqVNJLbnEvnckP4Q9y2XDOUwDQYJ
-KoZIhvcNAQEFBQADggEBAOZaSI+yZF8yJyUuwE+rfxiTPARNAcfvk2aZluLnW77F
-yIutnbUefGHCwizVrZlV5y2TDDbsVsvNDmFpzEYP5l3DzkCtaCS5VhqPYcs24hN6
-Cv5mxYMiXcAzvBfeF00N08eZhMHqjTArwSMy0FDI3x+9eykIdiGAk+bVhGTVgODb
-Aozy2tOSe3IQkBbEhNMwXG6zd0vk+EvjJOY70mDM1fTstk1RlC5SfKOKedR7OPVx
-XWs22uhZ+dUKGogeaw1c8TIN5IecMckSvoBEKlNnWUUqkRZ+uPXc39UAxSgkbp6k
-Nwmwca4vUPP18NPxE6sVgzPFFieSJjeVNXufl0sye1Q=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.antagning.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testa.antagning.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.antagning.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.antagning.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.antagning.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testa.antagning.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.antagning.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.antagning.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
deleted file mode 100644
index 4530c985..00000000
--- a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testa.universityadmissions.se/aws-sp-en">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/Login"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.testa.universityadmissions.se/aws-sp-en</ds:KeyName>
- <ds:KeyName>www.testa.universityadmissions.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.testa.universityadmissions.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDYTCCAkmgAwIBAgIJALaHWD91lN/0MA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
-BAMTIXd3dy50ZXN0YS51bml2ZXJzaXR5YWRtaXNzaW9ucy5zZTAeFw0xMjAxMTIw
-ODUyMTJaFw0yMjAxMDkwODUyMTJaMCwxKjAoBgNVBAMTIXd3dy50ZXN0YS51bml2
-ZXJzaXR5YWRtaXNzaW9ucy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALbfTMa6QUT6f3OMkFHSpDQFwuEc9lU5jq3t4VJZXJjbYtRe1wq6P8NAPE0X
-iE+GGm+E3rO7D6XlRNUSMhYCByL5sF8fcuU8mv/dnyrktSt6Bpznys7nkG+tZ3G1
-BqFbNRkn4RqhS7f2DcyRDENIfpVX+8kqI9AtHhcvr2c94jHjeXezTSSSt104eb5F
-k2hqUx3F+8G4VH3QPXPxm24k9ka1QY8c3362OOJEV7X/TBg444AM/l/Et/NxI47j
-s0XOHw9ThUNx/MCdd80xGA62hmwIu+iewstfgmvSp8Y9+0sUEXtTcwrJi7/GFJ2a
-9P8OlIfZ+XM8a6s9wn1U1us+boUCAwEAAaOBhTCBgjBhBgNVHREEWjBYgiF3d3cu
-dGVzdGEudW5pdmVyc2l0eWFkbWlzc2lvbnMuc2WGM2h0dHBzOi8vd3d3LnRlc3Rh
-LnVuaXZlcnNpdHlhZG1pc3Npb25zLnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUrWWQ
-AHLNSBUZDheT8ClXNWdru0cwDQYJKoZIhvcNAQEFBQADggEBAFwOmKvbegaxrx6k
-xnrA6maO2O6r5CMKtinTFu1E5IdkEh+FesDl7X8T1ccy6bkGBAg4L3Vd1J6GfoNy
-7wPoVJsL+DwFZ8LUccweI8PDBmrTx3z5ji3fdiYhBNCbu8x/jJ7D8zfd6WCnRmmP
-hzQNYoV1JN8UBP5Rs1YaXJHBKSw0lkU1sf/esYTJdBA1hmloykA6P45Qez92pHdl
-uVnNfkBr7UdYjz8IiPTitv+Yn7FUuXSacFejhLoHOeeskNdYJ3W4CtY9kB2FO4cF
-TEgTnrYK7hYZuU8O+wJUDDJkahZN9Kuf56JVejRBQZZ6mpVdMHs/Mj2XzxpHlDTe
-aERyA2E=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.testb.antagning.se-aws-sp.xml b/swamid-2.0/www.testb.antagning.se-aws-sp.xml
deleted file mode 100644
index d648cb35..00000000
--- a/swamid-2.0/www.testb.antagning.se-aws-sp.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testb.antagning.se/aws-sp">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.testb.antagning.se/aws-sp</ds:KeyName>
- <ds:KeyName>www.testb.antagning.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.testb.antagning.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAKCQNeL/EBzjMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnd3dy50ZXN0Yi5hbnRhZ25pbmcuc2UwHhcNMTEwODI1MTMxNzU2WhcNMjEw
-ODIyMTMxNzU2WjAhMR8wHQYDVQQDExZ3d3cudGVzdGIuYW50YWduaW5nLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH0zgKGfxWBRVrjK/Vi2yWU3
-KSbmZfwjRfznULF3EUooB2ylh3pzm4uDHlRlC7kMet2NaOeTfUFrU7Ea1WiTlJik
-+mW+xXhL3IVua3UNuPd3NvYcAi6P5WCoqfzmDGq/EsZPcDCF6N4TeK2d/1ZsIi4l
-lVGnwrkeHBudCt5jFqvz2kUIRuRhKr+8/KNFCJyHthL+aPilI+cTZbYSYGs2uxA6
-gycuW5sHqhhWX+po32bBXVkmIQiNf3pC+/+zN/se5bHisqZvNk7WMGpplKgxDY+3
-rAZ4m1t/oqNAC0qR8cdp1rU6QYUNwuthdrrz6+0/dkiZD0v+rHnLHD0L83mgIwID
-AQABo2swaTBIBgNVHREEQTA/ghZ3d3cudGVzdGIuYW50YWduaW5nLnNlhiVodHRw
-czovL3d3dy50ZXN0Yi5hbnRhZ25pbmcuc2UvYXdzLXNwMB0GA1UdDgQWBBTIQhxb
-kYXnJHxpO2M1oJS4lsDquTANBgkqhkiG9w0BAQUFAAOCAQEAThmqiMzJ/PbSc0PH
-wtxuLxgOs7/an5DFVs6Nb+sFzih78APz2gF9g2jUQp/A0SkvWeyW8Qhy2OmVTDZx
-tX3ZEUqIDBa5QoDpdQdR7Jjcqk0wbhJTYYFngd5Q9pNXHCk6yBsxFNHDo4lTJkTP
-sD2aW1Zb/f7QkiCLAtnhJcVTV2r5m98AAxFL153+OIy3C8m8zMPQ/w4JEwjrHsC8
-KXY4ClB5AiNom7BHLFHxkvrQaBh2Xuw1QR+N+RiV63O4oTDc1+PfV9U6TIZuGtmW
-U0kuBfzXbhSZIt95QCN4uKIl0MATKArcZT/+3GWXAX1NC2sCeYBqMu2yakST2OcT
-UvKqjQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.testb.antagning.se/aws-sp</ds:KeyName>
- <ds:KeyName>www.testb.antagning.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.testb.antagning.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAKCQNeL/EBzjMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnd3dy50ZXN0Yi5hbnRhZ25pbmcuc2UwHhcNMTEwODI1MTMxNzU2WhcNMjEw
-ODIyMTMxNzU2WjAhMR8wHQYDVQQDExZ3d3cudGVzdGIuYW50YWduaW5nLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH0zgKGfxWBRVrjK/Vi2yWU3
-KSbmZfwjRfznULF3EUooB2ylh3pzm4uDHlRlC7kMet2NaOeTfUFrU7Ea1WiTlJik
-+mW+xXhL3IVua3UNuPd3NvYcAi6P5WCoqfzmDGq/EsZPcDCF6N4TeK2d/1ZsIi4l
-lVGnwrkeHBudCt5jFqvz2kUIRuRhKr+8/KNFCJyHthL+aPilI+cTZbYSYGs2uxA6
-gycuW5sHqhhWX+po32bBXVkmIQiNf3pC+/+zN/se5bHisqZvNk7WMGpplKgxDY+3
-rAZ4m1t/oqNAC0qR8cdp1rU6QYUNwuthdrrz6+0/dkiZD0v+rHnLHD0L83mgIwID
-AQABo2swaTBIBgNVHREEQTA/ghZ3d3cudGVzdGIuYW50YWduaW5nLnNlhiVodHRw
-czovL3d3dy50ZXN0Yi5hbnRhZ25pbmcuc2UvYXdzLXNwMB0GA1UdDgQWBBTIQhxb
-kYXnJHxpO2M1oJS4lsDquTANBgkqhkiG9w0BAQUFAAOCAQEAThmqiMzJ/PbSc0PH
-wtxuLxgOs7/an5DFVs6Nb+sFzih78APz2gF9g2jUQp/A0SkvWeyW8Qhy2OmVTDZx
-tX3ZEUqIDBa5QoDpdQdR7Jjcqk0wbhJTYYFngd5Q9pNXHCk6yBsxFNHDo4lTJkTP
-sD2aW1Zb/f7QkiCLAtnhJcVTV2r5m98AAxFL153+OIy3C8m8zMPQ/w4JEwjrHsC8
-KXY4ClB5AiNom7BHLFHxkvrQaBh2Xuw1QR+N+RiV63O4oTDc1+PfV9U6TIZuGtmW
-U0kuBfzXbhSZIt95QCN4uKIl0MATKArcZT/+3GWXAX1NC2sCeYBqMu2yakST2OcT
-UvKqjQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.antagning.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testb.antagning.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.antagning.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testb.antagning.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.antagning.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testb.antagning.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.antagning.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testb.antagning.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.testb.antagning.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testb.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testb.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testb.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testb.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml
deleted file mode 100644
index 7c1acd4f..00000000
--- a/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testb.universityadmissions.se/aws-sp-en">
- <md:Extensions>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
- <md:Extensions>
- <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/Login"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>https://www.testb.universityadmissions.se/aws-sp-en</ds:KeyName>
- <ds:KeyName>www.testb.universityadmissions.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=www.testb.universityadmissions.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIDYTCCAkmgAwIBAgIJAKCp5PactoVWMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
-BAMTIXd3dy50ZXN0Yi51bml2ZXJzaXR5YWRtaXNzaW9ucy5zZTAeFw0xMjA2MTgx
-MTEyNDFaFw0yMjA2MTYxMTEyNDFaMCwxKjAoBgNVBAMTIXd3dy50ZXN0Yi51bml2
-ZXJzaXR5YWRtaXNzaW9ucy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL17aPyf7P85FYjx8dWUN0/Re36zuNrMa/AH834NzAZHvYSFa2tqJwJ3bDL3
-xspNbHteBWWg8uzSCsLEjY8pyxa1W2JoziJUqs6yDguMCLgKw4aIn0C+QDlYvCIH
-p/CgyK1wSabdZwO/gYGSqsRWbQAt9ekB1Vb4hSKB1oe2n3acDVdpqQ7QqN/ygh0e
-ADRpBZUgJmOIJXqgjAaimINoKr6C5nksauSUcFG9jE6NM5OxUC18eJozza3VSyvR
-iBCCQR/gfkkYfMbYqs2bgvvJp9Bb379ALU/nmLXTYYKKjpkss8Tqcnd5zo9Ug66L
-YojXoPQTiPX4h/Ztl0J912u5zR8CAwEAAaOBhTCBgjBhBgNVHREEWjBYgiF3d3cu
-dGVzdGIudW5pdmVyc2l0eWFkbWlzc2lvbnMuc2WGM2h0dHBzOi8vd3d3LnRlc3Ri
-LnVuaXZlcnNpdHlhZG1pc3Npb25zLnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQU2sYX
-5cCdiCtTBI6SSqonLs7Ga54wDQYJKoZIhvcNAQEFBQADggEBAHb+Nw3yVFTujXGw
-hVunA8U/GYSxO09fbpfznOr+lu6onh1JmoRzo9KZLtybPwo7pG4UuYjZ6BFL/syd
-j5mYp9S9z/rVNFoOPwOPB+75yTz7W0JWyeGB4tmv2t9dUmahGYkASgufP91FhIjv
-bZRfbhmAcGOzBH+dQgtX8KrsWKJhLhycEpraEMheNCo2MsGTtCkgjRA9FT9BYnKB
-h88ksmL3tJCtzUidP5arZ0Jeou1HMgdU69Avp5Vcgec+79yfcBMdhvVPYhuEewRV
-OXby+4b8kS9dKf+yWvE6SBIlq4etX7nzJw/aPthRQvkvyaANQf8GhtLZFF4JgqQe
-Ozn4TSg=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 133d23f0..82f9e10b 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -48,12 +48,6 @@
<xi:include href="swamid-2.0/expert.antagning.se-ecs-sp.xml"/>
<xi:include href="swamid-2.0/www.antagning.se-aws-sp.xml"/>
<xi:include href="swamid-2.0/www.universityadmissions.se-aws-sp-en.xml"/>
- <xi:include href="swamid-2.0/expert.testa.antagning.se-ecs-sp.xml"/>
- <xi:include href="swamid-2.0/www.testa.antagning.se-aws-sp.xml"/>
- <xi:include href="swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml"/>
- <xi:include href="swamid-2.0/expert.testb.antagning.se-ecs-sp.xml"/>
- <xi:include href="swamid-2.0/www.testb.antagning.se-aws-sp.xml"/>
- <xi:include href="swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
<xi:include href="swamid-2.0/kilwtest.it.ki.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/lpwtest.it.ki.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
@@ -82,7 +76,6 @@
<xi:include href="swamid-2.0/sp.it.gu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/umdac-strike.ad.umu.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/www.antagning.se-ecs-sp.xml"/>
<xi:include href="swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/aktivera.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/www.servicedesk.umdac.umu.se-shibboleth.xml"/>
@@ -276,9 +269,6 @@
<xi:include href="swamid-2.0/its-utv03.ad.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/data.kb.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/blender.c3se.chalmers.se-a.xml"/>
- <xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt"/>
- <xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt"/>
- <xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt"/>
<xi:include href="swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml"/>
<xi:include href="swamid-2.0/service.projectplace.com-saml-metadata.xml"/>
<xi:include href="swamid-2.0/tentaadmin.uhr.se-shibboleth.xml"/>
@@ -492,7 +482,6 @@
<xi:include href="swamid-2.0/sam.cs.lth.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/www.vr-rut.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/data.houseoffinance.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/expert.test.antagning.se-ecs-sp.xml"/>
<xi:include href="swamid-2.0/www.led.aitp.ladok.se-gui-sp.xml"/>
<xi:include href="swamid-2.0/student.utb.uppfoljning.ladok.se-student-sp.xml"/>
<xi:include href="swamid-2.0/www.ate.ladok.se-gui-sp.xml"/>
@@ -636,4 +625,7 @@
<xi:include href="swamid-2.0/www.utb1.ladok.se-gui-sp.xml"/>
<xi:include href="swamid-2.0/student.utb1.ladok.se-student-sp.xml"/>
<xi:include href="swamid-2.0/djnro.eduroam.se.xml"/>
+ <xi:include href="swamid-2.0/www.test.antagning.se-aws-sp.xml"/>
+ <xi:include href="swamid-2.0/expert.test.antagning.se-ecs-sp.xml"/>
+ <xi:include href="swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 1c2325b8..fc463c8f 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -5,14 +5,11 @@
<xi:include href="swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/coip-test.sunet.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/openidp.feide.no.xml"/>
- <xi:include href="swamid-2.0/dwidp.testa.antagning.se-dw-idp.xml"/>
<xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
<xi:include href="swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
<xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
- <xi:include href="swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml"/>
- <xi:include href="swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
<xi:include href="swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
<xi:include href="swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index e22c470f..c8bbed45 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -10,16 +10,9 @@
<xi:include href="swamid-2.0/smultron.catalogix.se-8090-sp.xml"/>
<xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
<xi:include href="swamid-2.0/vmfront.lan.kth.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/www.testb.antagning.se-aws-sp.xml"/>
- <xi:include href="swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
- <xi:include href="swamid-2.0/expert.testb.antagning.se-ecs-sp.xml"/>
- <xi:include href="swamid-2.0/expert.testa.antagning.se-ecs-sp.xml"/>
- <xi:include href="swamid-2.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
- <xi:include href="swamid-2.0/www.testa.antagning.se-aws-sp.xml"/>
<xi:include href="swamid-2.0/www-en.nyautb.its.umu.se-aws-sp-en.xml"/>
<xi:include href="swamid-2.0/expert.nyautb.its.umu.se-ecs-sp.xml"/>
<xi:include href="swamid-2.0/www.nyautb.its.umu.se-aws-sp.xml"/>
- <xi:include href="swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml"/>
<xi:include href="swamid-2.0/test-chalmers.pingpong.net-shibboleth.xml"/>
<xi:include href="swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml"/>
<xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml"/>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 22:26:36 +0000