summaryrefslogtreecommitdiff
path: root/nya-1.0
diff options
context:
space:
mode:
Diffstat (limited to 'nya-1.0')
-rw-r--r--nya-1.0/ab11.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/ab11.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/ab11.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/at11.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/at11.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/at11.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/dwidp.antagning.se.xml35
-rw-r--r--nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/ft10.ladok.umu.se-idp.xml35
-rw-r--r--nya-1.0/ft10.ladok.umu.se-sp.xml6
-rw-r--r--nya-1.0/ft11.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/ft11.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/ft11.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/it11.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/it11.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/it11.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nb10.ladok.umu.se-idp.xml35
-rw-r--r--nya-1.0/nb10.ladok.umu.se-sp.xml6
-rw-r--r--nya-1.0/nb11.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nb11.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nb11.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-00-aw-sp.xml6
-rw-r--r--nya-1.0/nya-00-dw-idp.xml35
-rw-r--r--nya-1.0/nya-00-dw-sp.xml6
-rw-r--r--nya-1.0/nya-00.ladok.umu.se.xml35
-rw-r--r--nya-1.0/nya-01.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-01.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-02.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-02.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-03.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-03.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-03.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-04.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-04.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-05.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-05.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-06.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-06.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-07.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-07.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-08.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-08.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-08.ladok.umu.se-sp.xml1
-rw-r--r--nya-1.0/nya-08.ladok.umu.se.xml35
-rw-r--r--nya-1.0/nya-09.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-09.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-10.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/nya-10.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/nya-16.ladok.umu.se-aws-sp.xml76
-rw-r--r--nya-1.0/nya-16.ladok.umu.se-dw-idp.xml61
-rw-r--r--nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml76
-rw-r--r--nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml61
-rw-r--r--nya-1.0/nya-17.ladok.umu.se-aws-sp.xml76
-rw-r--r--nya-1.0/nya-17.ladok.umu.se-dw-idp.xml61
-rw-r--r--nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml76
-rw-r--r--nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml61
-rw-r--r--nya-1.0/nya-18.ladok.umu.se-aws-sp.xml76
-rw-r--r--nya-1.0/nya-18.ladok.umu.se-dw-idp.xml61
-rw-r--r--nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml76
-rw-r--r--nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml61
-rw-r--r--nya-1.0/nya-19.ladok.umu.se-aws-sp.xml76
-rw-r--r--nya-1.0/nya-19.ladok.umu.se-dw-idp.xml61
-rw-r--r--nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml76
-rw-r--r--nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml61
-rw-r--r--nya-1.0/nya-20.ladok.umu.se-aws-sp.xml76
-rw-r--r--nya-1.0/nya-20.ladok.umu.se-dw-idp.xml61
-rw-r--r--nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml76
-rw-r--r--nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml61
-rw-r--r--nya-1.0/shib-idp-test.oru.se.xml35
-rw-r--r--nya-1.0/shibboleth.antagning.se.xml35
-rw-r--r--nya-1.0/shibboleth.testa.antagning.se.xml35
-rw-r--r--nya-1.0/shibboleth.testb.antagning.se.xml35
-rw-r--r--nya-1.0/shibboleth.testc.ladok.umu.se.xml35
-rw-r--r--nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/vhs-dev01.dyndns.org.xml6
-rw-r--r--nya-1.0/vhs-shib.no-ip.org.xml6
-rw-r--r--nya-1.0/wb11.ladok.umu.se-aw-sp.xml6
-rw-r--r--nya-1.0/wb11.ladok.umu.se-dw-idp.xml35
-rw-r--r--nya-1.0/wb11.ladok.umu.se-dw-sp.xml6
-rw-r--r--nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml35
-rw-r--r--nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml6
-rw-r--r--nya-1.0/www.studera.testa.antagning.se.xml6
-rw-r--r--nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml6
-rw-r--r--nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml6
108 files changed, 1992 insertions, 1206 deletions
diff --git a/nya-1.0/ab11.ladok.umu.se-aws-sp.xml b/nya-1.0/ab11.ladok.umu.se-aws-sp.xml
index 97b6beb7..fd2f2918 100644
--- a/nya-1.0/ab11.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/ab11.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_92994cbbd74454f907ca9ce9400e0f4b" entityID="https://ab11.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ab11.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/ab11.ladok.umu.se-dw-idp.xml b/nya-1.0/ab11.ladok.umu.se-dw-idp.xml
index 60ee337e..f3da324d 100644
--- a/nya-1.0/ab11.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/ab11.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://ab11.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://ab11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/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://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ab11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAJEyNnsH5X5JMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ab11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml b/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml
index ebc055fd..4d4ef221 100644
--- a/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/ab11.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_c90fb725a0300ac7d6056c542385d110" entityID="https://ab11.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ab11.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ BrfmmWv6aakV77g0J6y2aQZu6I+jHzUh+evbyxHPwLg=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ab11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
index 3b2fb739..1ab04412 100644
--- a/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/ab11.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://ab11.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://ab11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/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://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ab11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAKUeldKSoneZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWFiMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ab11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/at11.ladok.umu.se-aws-sp.xml b/nya-1.0/at11.ladok.umu.se-aws-sp.xml
index c0c00789..60c54e70 100644
--- a/nya-1.0/at11.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/at11.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_4093d745bdeb20ddc93e0a07d380c761" entityID="https://at11.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://at11.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ IQ+6N+iGlnHpZfaJ/muwPkVf9Z0NrQ/MQaZE902BIyTbIrhSe7neTTq3+fxZ09nF
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/at11.ladok.umu.se-dw-idp.xml b/nya-1.0/at11.ladok.umu.se-dw-idp.xml
index 221c03a6..48200dd4 100644
--- a/nya-1.0/at11.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/at11.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://at11.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://at11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://at11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/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://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAN26K3mgeGhBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://at11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/at11.ladok.umu.se-ecs-sp.xml b/nya-1.0/at11.ladok.umu.se-ecs-sp.xml
index 1cc69974..0a0f39ae 100644
--- a/nya-1.0/at11.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/at11.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_bf6a96fc8528463894554825af21b283" entityID="https://at11.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://at11.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ DwgXjIdQQ4Q8V9Tw9aDuUelmN8hSs6711cslgeRre+Y=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml
index a0a11a42..d1470d57 100644
--- a/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/at11.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://at11.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://at11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://at11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/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://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://at11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAJk92wr3E8vjMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWF0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://at11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://at11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/dwidp.antagning.se.xml b/nya-1.0/dwidp.antagning.se.xml
index a6a55c35..d0868e33 100644
--- a/nya-1.0/dwidp.antagning.se.xml
+++ b/nya-1.0/dwidp.antagning.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://dwidp.antagning.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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.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">
@@ -20,28 +17,20 @@ MIIBsTCCAVugAwIBAgIJAKLW8BnDv4qgMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEmR3aWRwLmFu
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.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.antagning.se/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.antagning.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://dwidp.antagning.se/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.antagning.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://dwidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://dwidp.antagning.se/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.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">
@@ -60,15 +49,13 @@ MIIBsTCCAVugAwIBAgIJAKLW8BnDv4qgMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEmR3aWRwLmFu
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.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>
+</EntityDescriptor>
diff --git a/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml b/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
index 0550a3f4..a72fd04d 100644
--- a/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://dwidp.testc.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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.testc.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRl
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.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.testc.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://dwidp.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testc.ladok.umu.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">
@@ -60,15 +49,13 @@ MIIBxTCCAW+gAwIBAgIJAOCif9O3eXsKMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRl
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testc.ladok.umu.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>
+</EntityDescriptor>
diff --git a/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml b/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
index e405addb..42b3f447 100644
--- a/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://dwidp.testd.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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.testd.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRl
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.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.testd.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dwidp.testd.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://dwidp.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.testd.ladok.umu.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">
@@ -60,15 +49,13 @@ MIIBxTCCAW+gAwIBAgIJALRPjga13Bz+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRl
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://dwidp.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.testd.ladok.umu.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>
+</EntityDescriptor>
diff --git a/nya-1.0/ft10.ladok.umu.se-idp.xml b/nya-1.0/ft10.ladok.umu.se-idp.xml
index 1f234a21..b81d234f 100644
--- a/nya-1.0/ft10.ladok.umu.se-idp.xml
+++ b/nya-1.0/ft10.ladok.umu.se-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://ft10.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://ft10.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIDODCCAiCgAwIBAgIJAI0Ak//aNy/fMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTAubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.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://ft10.ladok.umu.se:444/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft10.ladok.umu.se:444/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,11 +49,9 @@ MIIDODCCAiCgAwIBAgIJAI0Ak//aNy/fMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTAubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.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>
@@ -80,4 +67,4 @@ MIIDODCCAiCgAwIBAgIJAI0Ak//aNy/fMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTAubGFk
<EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
</ContactPerson>
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/nya-1.0/ft10.ladok.umu.se-sp.xml b/nya-1.0/ft10.ladok.umu.se-sp.xml
index d15df97b..d2f2b74b 100644
--- a/nya-1.0/ft10.ladok.umu.se-sp.xml
+++ b/nya-1.0/ft10.ladok.umu.se-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_aeec82cd28107876ca7f70d3d2e0dbbb" entityID="https://ft10.ladok.umu.se/shibboleth-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft10.ladok.umu.se/shibboleth-sp">
<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>
@@ -71,4 +71,4 @@ kyW+UIfRS0B8rBKhspXYi5GIT+SQpJbLqfm7hvKo2IEQ+Xqc4JGmqD+Xivn7OpHB
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/ft11.ladok.umu.se-aws-sp.xml b/nya-1.0/ft11.ladok.umu.se-aws-sp.xml
index c488f88e..1007b89c 100644
--- a/nya-1.0/ft11.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/ft11.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_cc5d33937b72da0707a2734c243a7f99" entityID="https://ft11.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft11.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ Y80PIYF4N81pFeV1YCzG1fAabZjgQsaLIacq0N3wthw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/ft11.ladok.umu.se-dw-idp.xml b/nya-1.0/ft11.ladok.umu.se-dw-idp.xml
index 4901b91d..99fefc74 100644
--- a/nya-1.0/ft11.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/ft11.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://ft11.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://ft11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/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://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAKdoeNRKAdsMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ft11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml b/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml
index df288c1b..7d2f9ed0 100644
--- a/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/ft11.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_547a367c1c8935a85004642cc86971ad" entityID="https://ft11.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft11.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ pY5dKgwIX6AbzsP46N+1Ago7p+oIp7G2Yks5btxTQ2M=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
index c9df8915..1a323933 100644
--- a/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/ft11.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://ft11.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://ft11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/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://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ft11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAOZxNpeB/YGqMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://ft11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/it11.ladok.umu.se-aws-sp.xml b/nya-1.0/it11.ladok.umu.se-aws-sp.xml
index f97eb401..0c3c0bfb 100644
--- a/nya-1.0/it11.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/it11.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_c64eb6b2a66e23905011689fee5bdeb0" entityID="https://it11.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://it11.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ FnqFBsXSdggh38tbAtUBShpPoXkcKqph58a1GTRwLOU=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/it11.ladok.umu.se-dw-idp.xml b/nya-1.0/it11.ladok.umu.se-dw-idp.xml
index 7e15e626..ecf7e0d3 100644
--- a/nya-1.0/it11.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/it11.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://it11.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://it11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://it11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/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://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJALP3tUPcT/JPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://it11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/it11.ladok.umu.se-ecs-sp.xml b/nya-1.0/it11.ladok.umu.se-ecs-sp.xml
index e59bd3e2..5d95fb99 100644
--- a/nya-1.0/it11.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/it11.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_b8921b42d2f61cbe60bc567903fd2ca3" entityID="https://it11.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://it11.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ covtfYQ8Wn8ZrDBRqPLhvvz8KtmPpQXUn4uM5FzNhXA=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml
index 72b0b447..43f3c15b 100644
--- a/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/it11.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://it11.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://it11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://it11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/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://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://it11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJALsbHaA2BKKWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWl0MTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://it11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://it11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nb10.ladok.umu.se-idp.xml b/nya-1.0/nb10.ladok.umu.se-idp.xml
index 1f4588e0..db52c4d8 100644
--- a/nya-1.0/nb10.ladok.umu.se-idp.xml
+++ b/nya-1.0/nb10.ladok.umu.se-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nb10.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nb10.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0x
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-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://nb10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -59,15 +48,13 @@ MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0x
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-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>
+</EntityDescriptor>
diff --git a/nya-1.0/nb10.ladok.umu.se-sp.xml b/nya-1.0/nb10.ladok.umu.se-sp.xml
index ebea5591..de4fe24a 100644
--- a/nya-1.0/nb10.ladok.umu.se-sp.xml
+++ b/nya-1.0/nb10.ladok.umu.se-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_105b120f9050e3b3114cd14d8b1ae7d8" entityID="https://nb10.ladok.umu.se/shibboleth-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb10.ladok.umu.se/shibboleth-sp">
<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">
@@ -68,4 +68,4 @@ KyI1tqS2gQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nb11.ladok.umu.se-aws-sp.xml b/nya-1.0/nb11.ladok.umu.se-aws-sp.xml
index a21f3b5f..b0d34f0b 100644
--- a/nya-1.0/nb11.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nb11.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0a4a721c6f5d9fc61031bdefa446cd40" entityID="https://nb11.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb11.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ Mm6Xu6nAdYf4aMbx97LnhFQxu39vxJGGzTO5hvog0dw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nb11.ladok.umu.se-dw-idp.xml b/nya-1.0/nb11.ladok.umu.se-dw-idp.xml
index 04956fc2..f73d9a03 100644
--- a/nya-1.0/nb11.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nb11.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nb11.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nb11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/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://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAL+2lGQMoHf1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml b/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml
index 660cf39f..615e2f41 100644
--- a/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nb11.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f5172360dcce469aaf1aab64fbb6f093" entityID="https://nb11.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb11.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ CW028wnxsYsPpbKp9m+Q2DC6ucnzozt6kYfxmksErAk=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
index 69f037dd..6707cfd6 100644
--- a/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nb11.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nb11.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nb11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/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://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAO5XS9QJ/FbCMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEW5iMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-00-aw-sp.xml b/nya-1.0/nya-00-aw-sp.xml
index 3faba216..a47f574e 100644
--- a/nya-1.0/nya-00-aw-sp.xml
+++ b/nya-1.0/nya-00-aw-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_d76e1e90412c1b3fced81a70aa7c0629" entityID="https://nya-00.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-00.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ cBkHihT/F46zGHLlZu9kH/1uO0ZZZcQZHmdSyGUyZoJu6gO5dFDBbVQqS6vmkzpj
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-00-dw-idp.xml b/nya-1.0/nya-00-dw-idp.xml
index 1740aa2c..a1b7cb5c 100644
--- a/nya-1.0/nya-00-dw-idp.xml
+++ b/nya-1.0/nya-00-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-00.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-00.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/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://nya-00.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJlTo2VBwsU+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-00.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-00-dw-sp.xml b/nya-1.0/nya-00-dw-sp.xml
index f3dfacf4..70f2eff7 100644
--- a/nya-1.0/nya-00-dw-sp.xml
+++ b/nya-1.0/nya-00-dw-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_7d3e26cd696e453dc88fc904893cb4f6" entityID="https://nya-00.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-00.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ EQCi6eLTHNmRPDAUY7W6LPbhNtXs1ieRJ8tKFug4pEjGAq7FDPCIQA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-00.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-00.ladok.umu.se.xml b/nya-1.0/nya-00.ladok.umu.se.xml
index 7e8d6791..ca0b4668 100644
--- a/nya-1.0/nya-00.ladok.umu.se.xml
+++ b/nya-1.0/nya-00.ladok.umu.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-00.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-00.ladok.umu.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">
@@ -30,28 +27,20 @@ MIIBtDCCAV6gAwIBAgIJALEdXhcAAnYWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/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://nya-00.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-00.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -80,15 +69,13 @@ MIIBtDCCAV6gAwIBAgIJALEdXhcAAnYWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMC5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-00.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml
index 250a79f4..7c95995b 100644
--- a/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-01.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_16613b4c819a1f8653c405a4863a1668" entityID="https://nya-01.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml
index 5a0b2e15..6a905290 100644
--- a/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-01.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-01.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-01.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/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://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJVmiUdC/zXxMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-01.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml
index 13fe3c23..7fc0399a 100644
--- a/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-01.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_57308edcca653150d19bd5deea18aefe" entityID="https://nya-01.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-01.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ qh8BHWWieGGw3DYsjsf2XJ0p66moTQcMsj1qCp04bxSJK0/mOM5PaA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
index 0e487e47..032d973d 100644
--- a/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-01.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-01.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/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://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-01.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPHStM1YyXAGMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMS5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-01.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml
index fa63c296..9bfe5c65 100644
--- a/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-02.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_670ca40bfa0fe7f56e09cfbe5e41fe22" entityID="https://nya-02.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-02.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ gLLMMYf8vEp2AOcBV8rZJVsOKzeE34gjigUGgYm4HnVvwTX93ynW8g==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml
index f06c9c22..34fcaf63 100644
--- a/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-02.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-02.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-02.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/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://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAN6ISDAZSI6yMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-02.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml
index b9cc008a..35053d3f 100644
--- a/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-02.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0497930777193fa693ad36a088e6a8f6" entityID="https://nya-02.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-02.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ lAQAdUGXhsatw6HPstBeA8giygckztO/adctBws4k9IcAa8M++TXFg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
index c454002f..d0a9fa4c 100644
--- a/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-02.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-02.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/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://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-02.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAKjo6Vm3zYPcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMi5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-02.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml
index f3e0877d..4eec01ee 100644
--- a/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-03.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9e3cfa795b690b5c3e05257503b7603f" entityID="https://nya-03.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-03.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ VbkZxU3rbhVkcfTZJ9pPNYQUOUJ4atsmULm9M4Vdd4sDQWew6i6cww==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-03.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-03.ladok.umu.se-dw-idp.xml
index 11a380f9..5dd92e25 100644
--- a/nya-1.0/nya-03.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-03.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-03.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-03.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/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://nya-03.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAIQMwbIzGEliMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-03.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-03.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-03.ladok.umu.se-ecs-sp.xml
index f5bfe5e0..4c8a96b3 100644
--- a/nya-1.0/nya-03.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-03.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a0bca549d9c33b017b26d408aa566d3d" entityID="https://nya-03.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-03.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ u/U+ZV/5RHCzIBPq4uHnfyhOcbpZqzJIuM4Khz1hc01qrTR+1p+8dw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
index 3b467bc7..ea77494e 100644
--- a/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-03.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-03.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/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://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-03.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAJvPLe/aZwcVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wMy5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-03.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml
index f75019a7..7faf0169 100644
--- a/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-04.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_63704a1b68be46f1eb55e89a96e4941b" entityID="https://nya-04.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-04.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ nSbNUl+p5Ng0ca/Ab6zkIpzXFiH7BlqX14aurJxM6fbrjtWbIOO+Cg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml
index 7bafe764..611eedbf 100644
--- a/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-04.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-04.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-04.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/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://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAOFFbLCZsgeWMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-04.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml
index 789e432f..822c6579 100644
--- a/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-04.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_ba27109e3c3eb7d4b9c6240a25bbbc01" entityID="https://nya-04.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-04.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ IcYzJNIyLMdCa5pivjvbucso/OzksxRVVYzVGSocVnD8kAOKTpy1Pw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
index c1056999..4b07a706 100644
--- a/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-04.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-04.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/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://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-04.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAP5uOXVjyf8WMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNC5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-04.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml
index 02510083..3aee6545 100644
--- a/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-05.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9920e2a9defb929ab7827bacbf6f4575" entityID="https://nya-05.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-05.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ EQX2LGWstTC/6xgMa9NDK7qEvsbwVBkA1SKkzBqGI2gKixpGfxfwfg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml
index 9daa35c9..23c43d04 100644
--- a/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-05.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-05.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-05.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/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://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAK/QPI4JgXo4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-05.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml
index c70e3dc4..f1498c16 100644
--- a/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-05.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_78e1bec20441635ab48623a888f3b02d" entityID="https://nya-05.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-05.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ oCBNkhC7ViFZGEQltUaVigT5+btv/16Z/Ai80BdtnryL+qDi769xoQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
index 3f9a8b5a..ddfe3db5 100644
--- a/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-05.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-05.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/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://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-05.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAMq8mSfIEtM/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNS5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-05.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml
index 764d9e9a..98985e9d 100644
--- a/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-06.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_985d8dc6dad13f30fb91794a363231fe" entityID="https://nya-06.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-06.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ dklSPCcj7+fYPzTkF1HrUUgNxySRGOgA/LdcLWSS1F09e6uI32dINbQNscs9e4yA
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml
index b2f060eb..8cf9e21a 100644
--- a/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-06.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-06.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-06.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/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://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAM86/PCtuLXHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-06.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml
index 82b32fdc..c21ec576 100644
--- a/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-06.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_2a260cdccbac118390ea16bb5108efb3" entityID="https://nya-06.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-06.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ vRRFxllLGv3BJNrCPy1xECAcdy8S6qCXnscdNzxGpaBGyTflbekmFA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
index bac42759..c2b0eef4 100644
--- a/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-06.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-06.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/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://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-06.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJALdNKqwu8edHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNi5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-06.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml
index 162e1e71..e0b87c00 100644
--- a/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-07.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_39dfcaa3da3bbfc66c3cdbc37ac2d221" entityID="https://nya-07.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-07.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ OnZxS4a3OCEgsb4ValF7n3+eAjcgzElfzflHYQzgC1ficF0DqomUtw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml
index 014ff826..400ba763 100644
--- a/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-07.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-07.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-07.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/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://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAIcyUp71nFIhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-07.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml
index eb9e77be..c675fc74 100644
--- a/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-07.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_995fd1b84734e1bd25b98ad3ebc6673a" entityID="https://nya-07.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-07.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ OfYJhJ8JXiZCjsWFsQHuEtLwPjYx9nUTAB7NtqNZYHGDy8/xlobQqg==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
index caaeb03c..1a75dea7 100644
--- a/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-07.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-07.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/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://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-07.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAITygEu1ljwgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wNy5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-07.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml
index 86104407..3ed9e29b 100644
--- a/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-08.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6069bbc11a207cd92832ebb7b1801731" entityID="https://nya-08.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ iqqc8aRw9PsLE26XSs9w1mMTmA2OVPIVbqHRy6JvebD8ybmO0xA3Mw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml
index 443f9cbe..89230405 100644
--- a/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-08.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-08.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-08.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-08.ladok.umu.se-sp.xml b/nya-1.0/nya-08.ladok.umu.se-sp.xml
index 73108501..3e536a29 100644
--- a/nya-1.0/nya-08.ladok.umu.se-sp.xml
+++ b/nya-1.0/nya-08.ladok.umu.se-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-08.ladok.umu.se/ecs-sp">
<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">
diff --git a/nya-1.0/nya-08.ladok.umu.se.xml b/nya-1.0/nya-08.ladok.umu.se.xml
index 443f9cbe..89230405 100644
--- a/nya-1.0/nya-08.ladok.umu.se.xml
+++ b/nya-1.0/nya-08.ladok.umu.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-08.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-08.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-08.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAIef9eBAET2LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOC5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-08.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml
index 8b645550..f1333414 100644
--- a/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-09.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_65fcbca1a0a696ad6614438fedcf0e5e" entityID="https://nya-09.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-09.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml
index 15cd8954..930896c9 100644
--- a/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-09.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-09.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-09.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/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://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPjzG9hSyVItMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-09.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml
index b63819bd..1d76d4f3 100644
--- a/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-09.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_393a45f0f96859eaec2134221dcd9e34" entityID="https://nya-09.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-09.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ ena5FI92jFRbLqMXu2ViYfxIuQjvdrkNSX0vqF8f2ULc4JCVXIxArw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
index fd3789e8..226a49a1 100644
--- a/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-09.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-09.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/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://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-09.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPdDmDO9shppMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0wOS5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-09.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml
index 2bc96558..6a4155fe 100644
--- a/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/nya-10.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_15546213e9a26eebabd4496a578d1d6a" entityID="https://nya-10.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-10.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml
index ee1978fd..d5464f46 100644
--- a/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/nya-10.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-10.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-10.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/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://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAPu3UO/vbrvbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-10.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml
index ea80ece9..ced3f7ad 100644
--- a/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/nya-10.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_3fc97875790443380cbf93498b71542a" entityID="https://nya-10.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-10.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ H5hgUoLJ1QbK7IJzQAPU27OUBo8A6o45QZQh87McTiNrRXw/s2w4cQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
index 199df928..012f64f5 100644
--- a/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://nya-10.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://nya-10.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5s
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/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://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nya-10.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBtDCCAV6gAwIBAgIJAP3RrYHOJEQMMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xMC5s
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://nya-10.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/nya-16.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-16.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..8b1c1603
--- /dev/null
+++ b/nya-1.0/nya-16.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/aws-sp">
+
+ <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://nya-16.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrj2jIWBkK3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDAzWhcNMjEwMjA4
+MDYzMDAzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DRKG7KPX4zKZPQ8Zwe04nkWUsRNYE8s
+X0o8xqnfYuSpOHe2FoxuqEfculKQXPZVNiwxbV0gSROGP37R/2EIVoM6iAviiqyL
+OWGjZsuus6qTEUf7aFnhUF6xaANeyhC5TfM1JpWNDdmUVOuphl4kG0xNKWyKc+au
+WBw9/hPAfJ+npbpJ4euEQzgZAZzne8NFRL9ZODLUb0affPrROFG0V5k8myXQe8o/
+8LgTX05q5OxlFvh3iilZ3hTgGXasLWblQHE14lQNF7K2wOcH6W2Lsbwz0lk4ZBKM
+1WngIwstD3bKkdIyvsc4Kc7R5Mi5VxCwbMqaxB0K6Ufoy49qh+MqoQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpqYomq43TEIegKcLLYfhc
+SnmNCzANBgkqhkiG9w0BAQUFAAOCAQEAyiyt2FrUTznCjn4zGjidlGy/IWFS4fSZ
+T/TFWnEmpWvshxQrHAn0B7B/vkvvP44BexM6u6ztpfwFOkPE1XTsZoEC39zP/Urr
+wCOWSyqgdo6V19WvlDVSvzZUWX5PO8v6r1L8LhhdEYl7yzrLECPjHFwI0C/wA1mS
+E0cdmb9XLO9yjlBu7yqVJ92dqusAf92Jlz1uueToDgyK3MnRJRguD5aPv0yg+JkO
+b/ww2LTOR929U9YkjBUukM6dKPM0kYISPjVOPJCfivOA89/ZULWT28lmL/CET4Oh
+jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
+</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://nya-16.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANrj2jIWBkK3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDAzWhcNMjEwMjA4
+MDYzMDAzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DRKG7KPX4zKZPQ8Zwe04nkWUsRNYE8s
+X0o8xqnfYuSpOHe2FoxuqEfculKQXPZVNiwxbV0gSROGP37R/2EIVoM6iAviiqyL
+OWGjZsuus6qTEUf7aFnhUF6xaANeyhC5TfM1JpWNDdmUVOuphl4kG0xNKWyKc+au
+WBw9/hPAfJ+npbpJ4euEQzgZAZzne8NFRL9ZODLUb0affPrROFG0V5k8myXQe8o/
+8LgTX05q5OxlFvh3iilZ3hTgGXasLWblQHE14lQNF7K2wOcH6W2Lsbwz0lk4ZBKM
+1WngIwstD3bKkdIyvsc4Kc7R5Mi5VxCwbMqaxB0K6Ufoy49qh+MqoQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ni5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTpqYomq43TEIegKcLLYfhc
+SnmNCzANBgkqhkiG9w0BAQUFAAOCAQEAyiyt2FrUTznCjn4zGjidlGy/IWFS4fSZ
+T/TFWnEmpWvshxQrHAn0B7B/vkvvP44BexM6u6ztpfwFOkPE1XTsZoEC39zP/Urr
+wCOWSyqgdo6V19WvlDVSvzZUWX5PO8v6r1L8LhhdEYl7yzrLECPjHFwI0C/wA1mS
+E0cdmb9XLO9yjlBu7yqVJ92dqusAf92Jlz1uueToDgyK3MnRJRguD5aPv0yg+JkO
+b/ww2LTOR929U9YkjBUukM6dKPM0kYISPjVOPJCfivOA89/ZULWT28lmL/CET4Oh
+jl5VAnadb+E4/k9GzSwWtiR0p8Uv2arCq1/gzt1qDp3m37+C+pJ+wg==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-16.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-16.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..53ad2c29
--- /dev/null
+++ b/nya-1.0/nya-16.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-16.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMl3+ymieJ85Hbmjg7NoMWqiodJ4pKjfHJLLlbip8A/c4hm17Bhy2JrFXDZA3sKrmPVeOyGdPTp9bkFJpz0wy50CAwEAAaN/MH0wHQYDVR0OBBYEFLIKgU2us9/k1tHFqNReFBoWCC8fME4GA1UdIwRHMEWAFLIKgU2us9/k1tHFqNReFBoWCC8foSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAig9wrLq2cuEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALy/mxWz7aHKHV3PIqNqFG6NoRdYdjAWcHL/peRt1gIctjLNOtdUL2gBkfxATCwufFpDEqwx0EvIreKYPiwbPuo=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/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://nya-16.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIoPcKy6tnLhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMl3+ymieJ85Hbmjg7NoMWqiodJ4pKjfHJLLlbip8A/c4hm17Bhy2JrFXDZA3sKrmPVeOyGdPTp9bkFJpz0wy50CAwEAAaN/MH0wHQYDVR0OBBYEFLIKgU2us9/k1tHFqNReFBoWCC8fME4GA1UdIwRHMEWAFLIKgU2us9/k1tHFqNReFBoWCC8foSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAig9wrLq2cuEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBALy/mxWz7aHKHV3PIqNqFG6NoRdYdjAWcHL/peRt1gIctjLNOtdUL2gBkfxATCwufFpDEqwx0EvIreKYPiwbPuo=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8450/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/nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..a856fb2d
--- /dev/null
+++ b/nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-16.ladok.umu.se/ecs-sp">
+
+ <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://nya-16.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANOmErsQrSNvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4
+MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDBfmRg3HpFoqMzXVqrpkmYyMEoo93hx
+URtfL02+Eo27r5lvBI73iFbIr8Y2z0vTEEc4cx2nC0jA9BSA65XCNi3KxwchDRWv
+DufnsOJoD+ImQyujhSWmFq7cnwRmrE1THAmn2Gn+Ktps0Tlbe4XxYi67kqQhiGW9
+vdBqispl9MpCG/9Ebd6+m4DvHdBhlWmjADlIdk8l7hudUGaQ0a5tn0s/w2ODLqZt
+LYGFikFh5CUbf3Tk9hRxQ3iRFfbia+JJ+YC18f/DptaQ+9DWjB7dvRGWdkK/85oK
+xNZwFN1l0r982M04BiYoVcZdf+O0lH2A7Lnn39mx6UEVJ0IvAxv/ZwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTWuGMofab2XeGnO494wJzC
+2SQ9STANBgkqhkiG9w0BAQUFAAOCAQEAShUMdXqpSmdOg+WZDUPONMKagJmr/cmh
+rH0/f+iRDwWIjtTLfkE9CQ2ID/LQ4pMGkD0gPQynTWgTNK3+Chua2zfpg1vx2EV3
+M7vSJSheHPN+HKPnkkt1n3numAzLvDkUt98XXnUrwu0+MdHYTkE3fmcs2W0WNWIz
+9m4X2ZohniblG15LsaP5nmDHceDlmfg2Sq2FAsrZgl6zvCU1UUMxLnABdjTBw8QQ
+v5vgi77VvlDJlZEWKbbpQtVVNuDfoTrd+dw5zrPJliFdHkzIkMNoBggwEttO849r
+zqyiUXEA9xCj9ihZQenCbh7FZHXbp7fvA07EwU180jWHm8gh3XUDjA==
+</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://nya-16.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANOmErsQrSNvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA0WhcNMjEwMjA4
+MDYzMDA0WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApDBfmRg3HpFoqMzXVqrpkmYyMEoo93hx
+URtfL02+Eo27r5lvBI73iFbIr8Y2z0vTEEc4cx2nC0jA9BSA65XCNi3KxwchDRWv
+DufnsOJoD+ImQyujhSWmFq7cnwRmrE1THAmn2Gn+Ktps0Tlbe4XxYi67kqQhiGW9
+vdBqispl9MpCG/9Ebd6+m4DvHdBhlWmjADlIdk8l7hudUGaQ0a5tn0s/w2ODLqZt
+LYGFikFh5CUbf3Tk9hRxQ3iRFfbia+JJ+YC18f/DptaQ+9DWjB7dvRGWdkK/85oK
+xNZwFN1l0r982M04BiYoVcZdf+O0lH2A7Lnn39mx6UEVJ0IvAxv/ZwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTYubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ni5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTWuGMofab2XeGnO494wJzC
+2SQ9STANBgkqhkiG9w0BAQUFAAOCAQEAShUMdXqpSmdOg+WZDUPONMKagJmr/cmh
+rH0/f+iRDwWIjtTLfkE9CQ2ID/LQ4pMGkD0gPQynTWgTNK3+Chua2zfpg1vx2EV3
+M7vSJSheHPN+HKPnkkt1n3numAzLvDkUt98XXnUrwu0+MdHYTkE3fmcs2W0WNWIz
+9m4X2ZohniblG15LsaP5nmDHceDlmfg2Sq2FAsrZgl6zvCU1UUMxLnABdjTBw8QQ
+v5vgi77VvlDJlZEWKbbpQtVVNuDfoTrd+dw5zrPJliFdHkzIkMNoBggwEttO849r
+zqyiUXEA9xCj9ihZQenCbh7FZHXbp7fvA07EwU180jWHm8gh3XUDjA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..f3eddfa2
--- /dev/null
+++ b/nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-16.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA1WhcNMjEwMjA4MDYzMDA1WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK582cq6S4Ow3OBAXF1BT5KMNALtHp0HSCun939tNzdJHuD/fs1uglAcOXcNqZI7TRXgi7hltIhA7gAFU3xNotMCAwEAAaN/MH0wHQYDVR0OBBYEFIPz3+39iVSDAawyywIVwyBXZwdwME4GA1UdIwRHMEWAFIPz3+39iVSDAawyywIVwyBXZwdwoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAh4CVW6p+s6wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAEuu7MXLbhaqhk2QqrrTJp05YnLTG7b99Ujlc2GM3ImblVq0nPIieyl/wVwBdlbnWKBLncRgIqdrlEgX9oFrYo=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/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://nya-16.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAIeAlVuqfrOsMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA1WhcNMjEwMjA4MDYzMDA1WjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK582cq6S4Ow3OBAXF1BT5KMNALtHp0HSCun939tNzdJHuD/fs1uglAcOXcNqZI7TRXgi7hltIhA7gAFU3xNotMCAwEAAaN/MH0wHQYDVR0OBBYEFIPz3+39iVSDAawyywIVwyBXZwdwME4GA1UdIwRHMEWAFIPz3+39iVSDAawyywIVwyBXZwdwoSKkIDAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlggkAh4CVW6p+s6wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAAEuu7MXLbhaqhk2QqrrTJp05YnLTG7b99Ujlc2GM3ImblVq0nPIieyl/wVwBdlbnWKBLncRgIqdrlEgX9oFrYo=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-16.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:8448/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/nya-1.0/nya-17.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-17.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..5f89c864
--- /dev/null
+++ b/nya-1.0/nya-17.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/aws-sp">
+
+ <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://nya-17.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIc/FExfYq+AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA2WhcNMjEwMjA4
+MDYzMDA2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxoTPC9BSjlUw89mL0/2CBs8CMmI1iVwq
+1D1e3CoTUydpJ8CnJiSk6FHXhVsU5JbHFx5fecvDzcoXz73HeZR1y6niE/5IHuID
+AZs3Gpt+stRLDj14Dz0e0W645KV2LXat2AJWvCFsgBeVjmV06ySGv7M8Gu/VVlUs
+2pplhhvYkIW/dQziTN9zsPrxE6rg5x69xfkCJxFZxIKiq5wTzkGxmEItoJEC2Z44
+lSsEfqPfs4qq5Ga/D5bVaMYX6ZLGfCTnaIp2kQFepnbRx1kt5EDfwKcrBfIZiKDG
+MvsdzvjCRNftkdWI5pittlaUH+ZzhcyVto5XweaECyucQDxVWPuMjQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRW5LeNB9A98NTsIeeUHjF2
+2GJuRTANBgkqhkiG9w0BAQUFAAOCAQEAPpUbzWGHQ6Ri70zXgOV7KfJqubC5nKoS
+1IkkGRBRUe5qbQoTnrapW16Xgy7QAu/c58NqoaDaz03VbNrBuX7lfpYPr3DtSx6o
+CbmyxBA2H3Wefugnv/d4ngRhJzol2btJyhGD5l1zCfrPgFsRMtgVVwNNlBHScCza
+HBAAgxdgK7nsZIfTCGbUVzsVnkRatFt9qE7DWK1Lzc8nh0eUXpmBF7BKgUoO70LB
+z4XDZ3jsIvDuHopN8NJCa0su9qNpzgZdN3afvgyqMTpYBdMvUG9i/mkgzY6wnj2J
+mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
+</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://nya-17.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIc/FExfYq+AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA2WhcNMjEwMjA4
+MDYzMDA2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxoTPC9BSjlUw89mL0/2CBs8CMmI1iVwq
+1D1e3CoTUydpJ8CnJiSk6FHXhVsU5JbHFx5fecvDzcoXz73HeZR1y6niE/5IHuID
+AZs3Gpt+stRLDj14Dz0e0W645KV2LXat2AJWvCFsgBeVjmV06ySGv7M8Gu/VVlUs
+2pplhhvYkIW/dQziTN9zsPrxE6rg5x69xfkCJxFZxIKiq5wTzkGxmEItoJEC2Z44
+lSsEfqPfs4qq5Ga/D5bVaMYX6ZLGfCTnaIp2kQFepnbRx1kt5EDfwKcrBfIZiKDG
+MvsdzvjCRNftkdWI5pittlaUH+ZzhcyVto5XweaECyucQDxVWPuMjQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRW5LeNB9A98NTsIeeUHjF2
+2GJuRTANBgkqhkiG9w0BAQUFAAOCAQEAPpUbzWGHQ6Ri70zXgOV7KfJqubC5nKoS
+1IkkGRBRUe5qbQoTnrapW16Xgy7QAu/c58NqoaDaz03VbNrBuX7lfpYPr3DtSx6o
+CbmyxBA2H3Wefugnv/d4ngRhJzol2btJyhGD5l1zCfrPgFsRMtgVVwNNlBHScCza
+HBAAgxdgK7nsZIfTCGbUVzsVnkRatFt9qE7DWK1Lzc8nh0eUXpmBF7BKgUoO70LB
+z4XDZ3jsIvDuHopN8NJCa0su9qNpzgZdN3afvgyqMTpYBdMvUG9i/mkgzY6wnj2J
+mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-17.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-17.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..9bb4bfbf
--- /dev/null
+++ b/nya-1.0/nya-17.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-17.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA4WhcNMjEwMjA4MDYzMDA4WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfX5QXxKcCtXSsy14mzHytT9PjAw8gvBpB3atUvm/8t02GLwp9MYxAfFeNVq3IuiHmpKpZU567WBaagfKWoDykCAwEAAaN/MH0wHQYDVR0OBBYEFKMt4SIRNGRYKGHjBytuxuU6tp20ME4GA1UdIwRHMEWAFKMt4SIRNGRYKGHjBytuxuU6tp20oSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAsQj/l/4LyzUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhHFUqDz8BAE1A+yzuU/8LjasuAC6qQI9g9K9CKsqFT97tfl9MwwMTefT5iBa/0vMT8XEO8Xb3HUK/mLcuJ6us=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/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://nya-17.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALEI/5f+C8s1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA4WhcNMjEwMjA4MDYzMDA4WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfX5QXxKcCtXSsy14mzHytT9PjAw8gvBpB3atUvm/8t02GLwp9MYxAfFeNVq3IuiHmpKpZU567WBaagfKWoDykCAwEAAaN/MH0wHQYDVR0OBBYEFKMt4SIRNGRYKGHjBytuxuU6tp20ME4GA1UdIwRHMEWAFKMt4SIRNGRYKGHjBytuxuU6tp20oSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAsQj/l/4LyzUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEhHFUqDz8BAE1A+yzuU/8LjasuAC6qQI9g9K9CKsqFT97tfl9MwwMTefT5iBa/0vMT8XEO8Xb3HUK/mLcuJ6us=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8450/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/nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..c5f5050d
--- /dev/null
+++ b/nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-17.ladok.umu.se/ecs-sp">
+
+ <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://nya-17.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJLzeYJMjySuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA3WhcNMjEwMjA4
+MDYzMDA3WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweFKMrpruuM+TvzERHub4fpt/w8UqRjJ
+YY3/qg4f9e2ihEMLVwSauY4eQHUmbdPbdIgDcpNjT1VSmHqE7vTBQH03nc3id4MX
+0dIMuwQywc0+SJ9Qm42qBbbdONnXHKzUc8F3eNwAuVf/3L8xNQ/dgsZQg23B1RgH
+bei51bCvTBxRqsxhOJQ20bBKXsSCQML6J4YJA3RhaGyqRwEKuiAVeiU4EQMIIHvZ
+yc2oGzHwLfxGucacqHKCJBWhau9quBNJ94vUpD0kVZAXWE8ws/m73Nquw0SF2kPO
+DPI+WELyKoDVsc8uHB2PG56vlsM8V6guWArI6ETaovlQ/qLLljAa+wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQ8DNey5wUHYFRCfmP0y6WT
+ZTZsnTANBgkqhkiG9w0BAQUFAAOCAQEAPcHu1bVVi5yTB4Xc41MDWalKuCTY95/R
+ZLfh6Y4nTifITdI/rdXaPXVwKsXatHe18zCDnqmRXBPMdsUN/XBrzkitBqOAT/S+
+Ca93pZ2oDcsHLHaUpaBGazXEmw5Y1wJCPWaoUbGoyCWwYtpWNwbiAGtwTJaR01Bb
+x0YPR/ttJNGmhODgNKEhcjdaPKfP7ZeyGNfYu29uOzSJRuzOFy0YSUSAvXjoWWxH
+gGEItPYEhiXzhBKyxov5uv84rrCaHdhLnK2oekNkD4Sj9hxZQfrdAaiu+8W8gRTb
+ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
+</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://nya-17.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJLzeYJMjySuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA3WhcNMjEwMjA4
+MDYzMDA3WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweFKMrpruuM+TvzERHub4fpt/w8UqRjJ
+YY3/qg4f9e2ihEMLVwSauY4eQHUmbdPbdIgDcpNjT1VSmHqE7vTBQH03nc3id4MX
+0dIMuwQywc0+SJ9Qm42qBbbdONnXHKzUc8F3eNwAuVf/3L8xNQ/dgsZQg23B1RgH
+bei51bCvTBxRqsxhOJQ20bBKXsSCQML6J4YJA3RhaGyqRwEKuiAVeiU4EQMIIHvZ
+yc2oGzHwLfxGucacqHKCJBWhau9quBNJ94vUpD0kVZAXWE8ws/m73Nquw0SF2kPO
+DPI+WELyKoDVsc8uHB2PG56vlsM8V6guWArI6ETaovlQ/qLLljAa+wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQ8DNey5wUHYFRCfmP0y6WT
+ZTZsnTANBgkqhkiG9w0BAQUFAAOCAQEAPcHu1bVVi5yTB4Xc41MDWalKuCTY95/R
+ZLfh6Y4nTifITdI/rdXaPXVwKsXatHe18zCDnqmRXBPMdsUN/XBrzkitBqOAT/S+
+Ca93pZ2oDcsHLHaUpaBGazXEmw5Y1wJCPWaoUbGoyCWwYtpWNwbiAGtwTJaR01Bb
+x0YPR/ttJNGmhODgNKEhcjdaPKfP7ZeyGNfYu29uOzSJRuzOFy0YSUSAvXjoWWxH
+gGEItPYEhiXzhBKyxov5uv84rrCaHdhLnK2oekNkD4Sj9hxZQfrdAaiu+8W8gRTb
+ECwLl7pAoHdX5PKqhXh4PpbWDXmh+1Dh1hr3AFLaFFpqn75qMew+TA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..0f5048c6
--- /dev/null
+++ b/nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-17.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA5WhcNMjEwMjA4MDYzMDA5WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANlALlAK/0mT6QhWmbT/9GCFCw7ii7dTLClGBeEdzN3GS9sc3CsM+66G2eKQETBRNVEeoPjRJw8vMEPfYXt+CPUCAwEAAaN/MH0wHQYDVR0OBBYEFPje4tlzwgC/L3VKUqT8usyU41vNME4GA1UdIwRHMEWAFPje4tlzwgC/L3VKUqT8usyU41vNoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAxtMITx6oPjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMKBoq1RWdLUiH/Yf7ESVCAs4lDo6SUVoolHu7ZUatBK16PSTU1DAFq2u65wVU8+18+CUy+bLLnlwXNA/WjrgaQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/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://nya-17.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAMbTCE8eqD41MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA5WhcNMjEwMjA4MDYzMDA5WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANlALlAK/0mT6QhWmbT/9GCFCw7ii7dTLClGBeEdzN3GS9sc3CsM+66G2eKQETBRNVEeoPjRJw8vMEPfYXt+CPUCAwEAAaN/MH0wHQYDVR0OBBYEFPje4tlzwgC/L3VKUqT8usyU41vNME4GA1UdIwRHMEWAFPje4tlzwgC/L3VKUqT8usyU41vNoSKkIDAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlggkAxtMITx6oPjUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMKBoq1RWdLUiH/Yf7ESVCAs4lDo6SUVoolHu7ZUatBK16PSTU1DAFq2u65wVU8+18+CUy+bLLnlwXNA/WjrgaQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-17.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:8448/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/nya-1.0/nya-18.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-18.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..cbee8e5e
--- /dev/null
+++ b/nya-1.0/nya-18.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/aws-sp">
+
+ <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://nya-18.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANz6xPrAunzRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEwWhcNMjEwMjA4
+MDYzMDEwWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApStBOynWq4AwKzRApwYwzum1gGTYVr6X
+qSEazkKnNz7SBTENvAyMxylFiqE+E0xSJQ2fUNKkFo8iQNyW3CDOGKiEKfDm8wU8
+2Eo5QiiuTKvrJslKYpl+WVxa1SsfvxFAFPO1K7iwVqtuhMhhL9HAHG9RpsXXs9il
+JelBXtJtJQPfe1GnO9UyfivZ66bIRZBAWfGNLRGOYrZYkos8MJ02omIvFm2cttwu
+PuorkGevfBtPebCpX2dGIKkncc2KDY80CCBfi0llp9hKhYQZBRCMBl9h5mNH5Z5S
+pCDwKkRtYZ7Jxmi8rD7A7IwcGIng/OYxNp8d7nU010h/dN6Cj2f+jQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTnSFx9KUha74KSSQCsVtFg
+1z7fpjANBgkqhkiG9w0BAQUFAAOCAQEAlYc1tIA8bQVXREw8LRRfgVIGJFfgcciU
+tcVW+e2zEt0DT/f69nPqO9EGyate2+QiQeEsEDlVXuymjAUED5fJu5WNdysoF2SQ
+dvZ+oAMaW++bF2RPnKbUYT7iQXZnDhIvneFgeZoGhC+JiB3bhNuTs11ObRshXLC0
+pmOsKdRVNVK4IrJmt04Y1BBCzrQefjAcXMCmCpi7KeCY/pJLtWN8/RDSjbPEZYbe
+Ou+/c3n9AC9RwrLCz3jJXNuind05rW4pl//OFTitGTMkogYHxp0lDqA+AHb+HnCY
+9DDP/KdVkLuF0vN9jrBfoU9txTml0vqTfylynfdj0HzjKhJPeBOH5A==
+</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://nya-18.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANz6xPrAunzRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEwWhcNMjEwMjA4
+MDYzMDEwWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApStBOynWq4AwKzRApwYwzum1gGTYVr6X
+qSEazkKnNz7SBTENvAyMxylFiqE+E0xSJQ2fUNKkFo8iQNyW3CDOGKiEKfDm8wU8
+2Eo5QiiuTKvrJslKYpl+WVxa1SsfvxFAFPO1K7iwVqtuhMhhL9HAHG9RpsXXs9il
+JelBXtJtJQPfe1GnO9UyfivZ66bIRZBAWfGNLRGOYrZYkos8MJ02omIvFm2cttwu
+PuorkGevfBtPebCpX2dGIKkncc2KDY80CCBfi0llp9hKhYQZBRCMBl9h5mNH5Z5S
+pCDwKkRtYZ7Jxmi8rD7A7IwcGIng/OYxNp8d7nU010h/dN6Cj2f+jQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBTnSFx9KUha74KSSQCsVtFg
+1z7fpjANBgkqhkiG9w0BAQUFAAOCAQEAlYc1tIA8bQVXREw8LRRfgVIGJFfgcciU
+tcVW+e2zEt0DT/f69nPqO9EGyate2+QiQeEsEDlVXuymjAUED5fJu5WNdysoF2SQ
+dvZ+oAMaW++bF2RPnKbUYT7iQXZnDhIvneFgeZoGhC+JiB3bhNuTs11ObRshXLC0
+pmOsKdRVNVK4IrJmt04Y1BBCzrQefjAcXMCmCpi7KeCY/pJLtWN8/RDSjbPEZYbe
+Ou+/c3n9AC9RwrLCz3jJXNuind05rW4pl//OFTitGTMkogYHxp0lDqA+AHb+HnCY
+9DDP/KdVkLuF0vN9jrBfoU9txTml0vqTfylynfdj0HzjKhJPeBOH5A==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-18.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-18.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..8b208b8d
--- /dev/null
+++ b/nya-1.0/nya-18.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-18.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKsFUSxnW6U6w9L+QCCU8yMcU6fQcVKS6tnk200CC7G1YHhx/coB4l1GCqH0fUvKq2eyWhiIJC5e1sxMaixo3XcCAwEAAaN/MH0wHQYDVR0OBBYEFLqc/N3R6SgYw185VBo+pBlNZbEnME4GA1UdIwRHMEWAFLqc/N3R6SgYw185VBo+pBlNZbEnoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA/x12R2+YvpowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKflv/JlW+NqQuFPhHx5C19O/ScUIKmUNRrZo6UMWpzmyi8k6HG9klc6wJ5j+aexwHMastVVvNl8O6P+HPwEehQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/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://nya-18.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAP8ddkdvmL6aMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKsFUSxnW6U6w9L+QCCU8yMcU6fQcVKS6tnk200CC7G1YHhx/coB4l1GCqH0fUvKq2eyWhiIJC5e1sxMaixo3XcCAwEAAaN/MH0wHQYDVR0OBBYEFLqc/N3R6SgYw185VBo+pBlNZbEnME4GA1UdIwRHMEWAFLqc/N3R6SgYw185VBo+pBlNZbEnoSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA/x12R2+YvpowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKflv/JlW+NqQuFPhHx5C19O/ScUIKmUNRrZo6UMWpzmyi8k6HG9klc6wJ5j+aexwHMastVVvNl8O6P+HPwEehQ=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8450/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/nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..cffd282a
--- /dev/null
+++ b/nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-18.ladok.umu.se/ecs-sp">
+
+ <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://nya-18.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPaOYe2VSoQUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4
+MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxA0jnM15oF28eH75fJWmca5MLEVle3qN
+YXbcCFrOcagIkC2BuXeCXlPZFHl9PrtutR3OAsAWR930YDxiAmKZVY+HI0uDPw6/
+hFjZo/Q+i8BosKp872qtlpM34TH+8c1FRWpj7ag8lcNKQXHmbgdQbgtCL8u6mWg5
+QK8SuFqI7EHoO3gy5hUm/bB/LBSxF7Llqrlb7of62zM48fsFvuZR+hQYoEPFanu1
+qCXlVfISZy4sH/C4b0joC2vjWgwEOlrDnzCumbNaXKuB6esu/NkP86ZYyzQiDaG4
+M2dkbttjtbx1L/WCpTWTPdyLnmCyibBWwAUEBB5TBsYjxpI+99pfhQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSfAMLMkgvvpzKT1zBRW8p1
+UaJ1QjANBgkqhkiG9w0BAQUFAAOCAQEATazLdy5mdxOtpjgN66QK/0sHyBQ1Lxk/
+FbwOxMZv2LY4OMHrwLe/VYizg+b+wP5FMe8SP8+mzLI0Y9F4+8b6DRJaUbRilubo
+464T5PNK2ciL1ROSlCmMlFe+V/bdi/AYbS3IRCH2d7JV/Let2zB4cA4sCVlTpwLk
+KPzxCZ4lcmm373gKa4RgCYSDMgMDDcETRy9iCrjhqtd4iVBwq0db/CLj15tN9meF
+kdgJQJhkP9Tjqlm/GDkSAaOtqtWb694v25xOoZ09KhmH4BjNmEgQ0+KayC9TxaqL
+hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
+</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://nya-18.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPaOYe2VSoQUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDExWhcNMjEwMjA4
+MDYzMDExWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxA0jnM15oF28eH75fJWmca5MLEVle3qN
+YXbcCFrOcagIkC2BuXeCXlPZFHl9PrtutR3OAsAWR930YDxiAmKZVY+HI0uDPw6/
+hFjZo/Q+i8BosKp872qtlpM34TH+8c1FRWpj7ag8lcNKQXHmbgdQbgtCL8u6mWg5
+QK8SuFqI7EHoO3gy5hUm/bB/LBSxF7Llqrlb7of62zM48fsFvuZR+hQYoEPFanu1
+qCXlVfISZy4sH/C4b0joC2vjWgwEOlrDnzCumbNaXKuB6esu/NkP86ZYyzQiDaG4
+M2dkbttjtbx1L/WCpTWTPdyLnmCyibBWwAUEBB5TBsYjxpI+99pfhQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTgubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBSfAMLMkgvvpzKT1zBRW8p1
+UaJ1QjANBgkqhkiG9w0BAQUFAAOCAQEATazLdy5mdxOtpjgN66QK/0sHyBQ1Lxk/
+FbwOxMZv2LY4OMHrwLe/VYizg+b+wP5FMe8SP8+mzLI0Y9F4+8b6DRJaUbRilubo
+464T5PNK2ciL1ROSlCmMlFe+V/bdi/AYbS3IRCH2d7JV/Let2zB4cA4sCVlTpwLk
+KPzxCZ4lcmm373gKa4RgCYSDMgMDDcETRy9iCrjhqtd4iVBwq0db/CLj15tN9meF
+kdgJQJhkP9Tjqlm/GDkSAaOtqtWb694v25xOoZ09KhmH4BjNmEgQ0+KayC9TxaqL
+hqoEJrT/VOpdDv4cepDFT+DtuJzyx7UyZTrVc/mHu6UCMuozleXcyw==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..a9bd04f5
--- /dev/null
+++ b/nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-18.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEyWhcNMjEwMjA4MDYzMDEyWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMFjOGScAuxeZLjNtwUA+iW4MaYqaFNAMCiS3hsh0y3VHbD+OuRtstOFSfc/jpkIp3cyIzRHQFRsTHTqMNVRciMCAwEAAaN/MH0wHQYDVR0OBBYEFDSr+W/AcL5UrEqqdXP8AcgJyxY5ME4GA1UdIwRHMEWAFDSr+W/AcL5UrEqqdXP8AcgJyxY5oSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA3YZhcRIYEWkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEGMBD9o1WlbAvpjV7Z3b8CYLnMRwTvSBLTK5XXi+M2cf6i1Bg3khaI6V8Im7bLkHybf9k0LH0ZPgaKP0hbUCFw=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/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://nya-18.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAN2GYXESGBFpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDEyWhcNMjEwMjA4MDYzMDEyWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMFjOGScAuxeZLjNtwUA+iW4MaYqaFNAMCiS3hsh0y3VHbD+OuRtstOFSfc/jpkIp3cyIzRHQFRsTHTqMNVRciMCAwEAAaN/MH0wHQYDVR0OBBYEFDSr+W/AcL5UrEqqdXP8AcgJyxY5ME4GA1UdIwRHMEWAFDSr+W/AcL5UrEqqdXP8AcgJyxY5oSKkIDAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlggkA3YZhcRIYEWkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAEGMBD9o1WlbAvpjV7Z3b8CYLnMRwTvSBLTK5XXi+M2cf6i1Bg3khaI6V8Im7bLkHybf9k0LH0ZPgaKP0hbUCFw=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-18.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:8448/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/nya-1.0/nya-19.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-19.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..e430cd78
--- /dev/null
+++ b/nya-1.0/nya-19.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/aws-sp">
+
+ <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://nya-19.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMWAUMzkvTL3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
+MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJyTJK4mJmZIrsWrrV1SUBIOcEQoOHus
+XZWBG2idtbYpJo/l1k0RRb8RQ+ex3p/JEPJi8P/nUA7I4hCspjD6Ms8YB3Bo2/ms
+Xzo3cRiLU1/2UwmgRxdqG/gD83ZRPUsUblwPahtyp8WrzUGmqE+9vparnnNcG0RR
+xavuyp4fPsjFPwjaFVxYTNJubOJksPGnQTxCuMJgM+LUFV11O05KUTzmSV/QZ7Km
+p1jM87iTO0HLp9GegHbGEU5OQ6LHIDzohsKqLgWTVsbJuNpv8buBg45yUe3mMPiz
+m0OGxbNLGRHvkjUiLO9xVu2nuwcDvuaenlFNJIKQjkXJ4+sCdM21rwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRJnt+aPsW742I4MZZzRsKO
+lqj0tTANBgkqhkiG9w0BAQUFAAOCAQEArvtdazgSyEnp5NSUetJw0ZqukY49OWD7
+pACxzvG3nBJXR4ZnbnzsJganSdYpOoeaYEddRfaOmLtJIhMoXjO8kmU4OjysoOit
+iNEjB1K94+6xwdG7k/UNsIgWOKfGUWvkBL2sFxIXxKrVDLrg1We5cEyfXbLuKmu7
+bfbOWpDhH8G25Eq2sGRry/VvGzRJgjJh6O3J57ZChdKahFUG/oCll4X/9gH/NfYy
+b2/XMG9zMk9vvk3xo7u8kwcojJ4lrmTH3yu8Idke5ynjDiebCk2xMJDiCpoQh1cl
+MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
+</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://nya-19.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMWAUMzkvTL3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
+MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJyTJK4mJmZIrsWrrV1SUBIOcEQoOHus
+XZWBG2idtbYpJo/l1k0RRb8RQ+ex3p/JEPJi8P/nUA7I4hCspjD6Ms8YB3Bo2/ms
+Xzo3cRiLU1/2UwmgRxdqG/gD83ZRPUsUblwPahtyp8WrzUGmqE+9vparnnNcG0RR
+xavuyp4fPsjFPwjaFVxYTNJubOJksPGnQTxCuMJgM+LUFV11O05KUTzmSV/QZ7Km
+p1jM87iTO0HLp9GegHbGEU5OQ6LHIDzohsKqLgWTVsbJuNpv8buBg45yUe3mMPiz
+m0OGxbNLGRHvkjUiLO9xVu2nuwcDvuaenlFNJIKQjkXJ4+sCdM21rwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRJnt+aPsW742I4MZZzRsKO
+lqj0tTANBgkqhkiG9w0BAQUFAAOCAQEArvtdazgSyEnp5NSUetJw0ZqukY49OWD7
+pACxzvG3nBJXR4ZnbnzsJganSdYpOoeaYEddRfaOmLtJIhMoXjO8kmU4OjysoOit
+iNEjB1K94+6xwdG7k/UNsIgWOKfGUWvkBL2sFxIXxKrVDLrg1We5cEyfXbLuKmu7
+bfbOWpDhH8G25Eq2sGRry/VvGzRJgjJh6O3J57ZChdKahFUG/oCll4X/9gH/NfYy
+b2/XMG9zMk9vvk3xo7u8kwcojJ4lrmTH3yu8Idke5ynjDiebCk2xMJDiCpoQh1cl
+MF2VuHyKURhfDXExoxAgxbRq40OLq+ihxU9YPZucKRAylY1Mydq0bA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-19.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-19.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..3ecc9af6
--- /dev/null
+++ b/nya-1.0/nya-19.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-19.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE1WhcNMjEwMjA4MDYzMDE1WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMjS5smDRRSKme3FVkYJBNvBv8WgLL45en+w2avccmTbl/5bS7z7UMxKRSQwg9KpUZRgufBHQt3nk4UBRuU0xZ0CAwEAAaN/MH0wHQYDVR0OBBYEFOcur2rrM9KrBYmMrMXw59E049vPME4GA1UdIwRHMEWAFOcur2rrM9KrBYmMrMXw59E049vPoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAuhmqDmgf1YgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKyHV9zDBrCE7bBU1adiJ2900BoITYW8NL34xCPuMxXPHsGFI39dUC2wqAdmDFD6QZecaEqdFROTR27IY7wAtmk=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/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://nya-19.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALoZqg5oH9WIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE1WhcNMjEwMjA4MDYzMDE1WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMjS5smDRRSKme3FVkYJBNvBv8WgLL45en+w2avccmTbl/5bS7z7UMxKRSQwg9KpUZRgufBHQt3nk4UBRuU0xZ0CAwEAAaN/MH0wHQYDVR0OBBYEFOcur2rrM9KrBYmMrMXw59E049vPME4GA1UdIwRHMEWAFOcur2rrM9KrBYmMrMXw59E049vPoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkAuhmqDmgf1YgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAKyHV9zDBrCE7bBU1adiJ2900BoITYW8NL34xCPuMxXPHsGFI39dUC2wqAdmDFD6QZecaEqdFROTR27IY7wAtmk=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8450/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/nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..b19c9a1f
--- /dev/null
+++ b/nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-19.ladok.umu.se/ecs-sp">
+
+ <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://nya-19.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIDWO/6B6u57MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
+MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DJr7QcgRpXhmvJEU7MXQzUbneHaepZ/
+1TBOjSKJx55cGLKiw75RfMLla/mEp4FUUArB7oUCUzr7h46/icFLO04JSWj/QGCS
+v938sBcb4ptvErYg5/OkFoGtprX0Frc3xUDjgPHLynIl/avZt4gSEgawg2mBCcXx
+PNah6oEFofX5TuwV5iWvS4xY4wv+E/PcK2wzXVjFnFPWwkR3dTZ6qy31/54na8kL
+f9OAc5nSs9Z/Z9Gf/r5ScTPTKFe9l8J1wOy3HCw9NTzrtMNxBS8En4syqBMmrL8g
+gns1mkI7Zd7JJC+NgyCBrT7BEuA7/tWTXeCZzzscqYhzV5EDpMjVHQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQB+2r7gWrBIhYpquUK1s8X
+72GGVDANBgkqhkiG9w0BAQUFAAOCAQEAVkYPmsdJY5AAR4ajBmCXhvk11Z7GRVnR
+E4yInboU0ZnBsR7cRY1/jleHmvkbOgaqWHAbnRCayHAszf4TDyqHcZLyp1v6zJ3T
+YdE+K7KNLQLhFsRQ6KWxawzxeaj88rN7QPP84db0V03M6w9gGvyZd3Brap2KCSCF
+Tly3nfEm6uWES0FuTJw5SIxfWDt0x3mvB9gDJdRjvBErGu5da/wrWfgQgY89aZq+
+MpGfOeGpoYdbwNxX+Bq/VuJB6YDCuvr68QnWqcLckCL33y0NZoGuTPoyq5eHpeda
+ER8Sto215PlOqQD1NUyzztZjub+spTzXkUffuJJTqFvoNl8BW8EoiA==
+</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://nya-19.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIDWO/6B6u57MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDE0WhcNMjEwMjA4
+MDYzMDE0WjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DJr7QcgRpXhmvJEU7MXQzUbneHaepZ/
+1TBOjSKJx55cGLKiw75RfMLla/mEp4FUUArB7oUCUzr7h46/icFLO04JSWj/QGCS
+v938sBcb4ptvErYg5/OkFoGtprX0Frc3xUDjgPHLynIl/avZt4gSEgawg2mBCcXx
+PNah6oEFofX5TuwV5iWvS4xY4wv+E/PcK2wzXVjFnFPWwkR3dTZ6qy31/54na8kL
+f9OAc5nSs9Z/Z9Gf/r5ScTPTKFe9l8J1wOy3HCw9NTzrtMNxBS8En4syqBMmrL8g
+gns1mkI7Zd7JJC+NgyCBrT7BEuA7/tWTXeCZzzscqYhzV5EDpMjVHQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTkubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+OS5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBQB+2r7gWrBIhYpquUK1s8X
+72GGVDANBgkqhkiG9w0BAQUFAAOCAQEAVkYPmsdJY5AAR4ajBmCXhvk11Z7GRVnR
+E4yInboU0ZnBsR7cRY1/jleHmvkbOgaqWHAbnRCayHAszf4TDyqHcZLyp1v6zJ3T
+YdE+K7KNLQLhFsRQ6KWxawzxeaj88rN7QPP84db0V03M6w9gGvyZd3Brap2KCSCF
+Tly3nfEm6uWES0FuTJw5SIxfWDt0x3mvB9gDJdRjvBErGu5da/wrWfgQgY89aZq+
+MpGfOeGpoYdbwNxX+Bq/VuJB6YDCuvr68QnWqcLckCL33y0NZoGuTPoyq5eHpeda
+ER8Sto215PlOqQD1NUyzztZjub+spTzXkUffuJJTqFvoNl8BW8EoiA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..7360a057
--- /dev/null
+++ b/nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-19.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIxWhcNMjEwMjA4MDYzMDIxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANk/P/fAZxYHeI2ScnuKYrlUEj3g+nkwdbSznbiwMHnktULGgBfRZS5eeV7ZzqXtPsjj2PrsMK61qiK4mfdKza8CAwEAAaN/MH0wHQYDVR0OBBYEFL/snbAG7ispUg7JVMxrAFR/i7JIME4GA1UdIwRHMEWAFL/snbAG7ispUg7JVMxrAFR/i7JIoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkA1LRIHle5teEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH6DxY3zEo4XyWbdhL6F/D5MYS8uggq6b3GhKzXKO89J8gVSzTgC5q192t3VM08SP0GUGiLC4Vya4RgDB+QPr6o=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/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://nya-19.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANS0SB5XubXhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIxWhcNMjEwMjA4MDYzMDIxWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANk/P/fAZxYHeI2ScnuKYrlUEj3g+nkwdbSznbiwMHnktULGgBfRZS5eeV7ZzqXtPsjj2PrsMK61qiK4mfdKza8CAwEAAaN/MH0wHQYDVR0OBBYEFL/snbAG7ispUg7JVMxrAFR/i7JIME4GA1UdIwRHMEWAFL/snbAG7ispUg7JVMxrAFR/i7JIoSKkIDAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlggkA1LRIHle5teEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAH6DxY3zEo4XyWbdhL6F/D5MYS8uggq6b3GhKzXKO89J8gVSzTgC5q192t3VM08SP0GUGiLC4Vya4RgDB+QPr6o=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-19.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:8448/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/nya-1.0/nya-20.ladok.umu.se-aws-sp.xml b/nya-1.0/nya-20.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..712d56e6
--- /dev/null
+++ b/nya-1.0/nya-20.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/aws-sp">
+
+ <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://nya-20.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKpnq/GoAGJ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIyWhcNMjEwMjA4
+MDYzMDIyWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArDD2p6kR0pYxnbzsPJWq273fxk4nnUHu
+o9pTFJ8olIN2W9D+/0DBkifWfut0XMUQTke4NxXVX3LvEMAJgX79AAZ3lI3zf1OK
+d7gP2DKidxoZupqiocWOML2EGww7MD9VU7DurCuH7p3bl3HC278KvCP3LBtMUqOt
+CO8n8y5cMmp0Q2ErslmB78AGhII47P93baoRv61XE77Wb8e+fOrRLyuIiTqv/qZT
+x9V38kK4sxYAbLMoOWbwOP62xLgHXz3Fcq5mTHYzDUv8wRJpI45AMNAL4X/6aK9S
+EgHWD96fcwdQHdZD292gHdeXLqWzKNk/CjQ4kKx10+fEuZGZQgjqxwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQCIEpbDyhGybIbV0kknwJH
+BC0kxDANBgkqhkiG9w0BAQUFAAOCAQEAR6R+uQ8NdX5uanLv2Br7MKXtxB5FuIwn
+xpuc9PQIanHNJrkK+lrmuYOmbl3bfRNXUpXPsZHFg/5nsVivUmTPTKNQcL5p7yHv
+Cl+IJju/EZKE/8hPBEi22TOpRckGnjq/irEnSfHmdAM0sjy1lbOPVvMkRqwb4MDG
+ZVsCCiWm44WVgZRi/uNdC26xsKtb5LvG5ynpf3L0c1Tzb5aVfLVYmnIdf4YJxd9u
+au2vZNfZQgtLdtcm/CrfG77LQIVwwhX9xF+MA38+u2Zr2w+AqKRM24CPq1nwyKlt
+DYshArlN0SyQfXRlAJwlcfND5e3Y6n/Sqn8ttD7we8StRgkIgHKK4A==
+</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://nya-20.ladok.umu.se/aws-sp</ds:KeyName>
+ <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKpnq/GoAGJ/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDIyWhcNMjEwMjA4
+MDYzMDIyWjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArDD2p6kR0pYxnbzsPJWq273fxk4nnUHu
+o9pTFJ8olIN2W9D+/0DBkifWfut0XMUQTke4NxXVX3LvEMAJgX79AAZ3lI3zf1OK
+d7gP2DKidxoZupqiocWOML2EGww7MD9VU7DurCuH7p3bl3HC278KvCP3LBtMUqOt
+CO8n8y5cMmp0Q2ErslmB78AGhII47P93baoRv61XE77Wb8e+fOrRLyuIiTqv/qZT
+x9V38kK4sxYAbLMoOWbwOP62xLgHXz3Fcq5mTHYzDUv8wRJpI45AMNAL4X/6aK9S
+EgHWD96fcwdQHdZD292gHdeXLqWzKNk/CjQ4kKx10+fEuZGZQgjqxwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQCIEpbDyhGybIbV0kknwJH
+BC0kxDANBgkqhkiG9w0BAQUFAAOCAQEAR6R+uQ8NdX5uanLv2Br7MKXtxB5FuIwn
+xpuc9PQIanHNJrkK+lrmuYOmbl3bfRNXUpXPsZHFg/5nsVivUmTPTKNQcL5p7yHv
+Cl+IJju/EZKE/8hPBEi22TOpRckGnjq/irEnSfHmdAM0sjy1lbOPVvMkRqwb4MDG
+ZVsCCiWm44WVgZRi/uNdC26xsKtb5LvG5ynpf3L0c1Tzb5aVfLVYmnIdf4YJxd9u
+au2vZNfZQgtLdtcm/CrfG77LQIVwwhX9xF+MA38+u2Zr2w+AqKRM24CPq1nwyKlt
+DYshArlN0SyQfXRlAJwlcfND5e3Y6n/Sqn8ttD7we8StRgkIgHKK4A==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-20.ladok.umu.se-dw-idp.xml b/nya-1.0/nya-20.ladok.umu.se-dw-idp.xml
new file mode 100644
index 00000000..41eba6c3
--- /dev/null
+++ b/nya-1.0/nya-20.ladok.umu.se-dw-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-20.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMiVUdeq9QLM2jh2jbHU7ERl1ssgOGLReW7fR/yNuMjY/dF7LDi6/PViSp65T4Q1fsw5OEdy9NWVIvUlRtPnTtMCAwEAAaN/MH0wHQYDVR0OBBYEFCiungw0fQomoVTdsSXCmnTbbW3pME4GA1UdIwRHMEWAFCiungw0fQomoVTdsSXCmnTbbW3poSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkA0r7wFkqhylkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1UvW7cvFqrryh7L9zemHqVYbjY7Dke8k7WfTaQaKEcNlYltDFj9gtltSEvr6VYRDFsOkpizCxBFVrPBuA2JgI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/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://nya-20.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:451/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJANK+8BZKocpZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMiVUdeq9QLM2jh2jbHU7ERl1ssgOGLReW7fR/yNuMjY/dF7LDi6/PViSp65T4Q1fsw5OEdy9NWVIvUlRtPnTtMCAwEAAaN/MH0wHQYDVR0OBBYEFCiungw0fQomoVTdsSXCmnTbbW3pME4GA1UdIwRHMEWAFCiungw0fQomoVTdsSXCmnTbbW3poSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkA0r7wFkqhylkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAF1UvW7cvFqrryh7L9zemHqVYbjY7Dke8k7WfTaQaKEcNlYltDFj9gtltSEvr6VYRDFsOkpizCxBFVrPBuA2JgI=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8450/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/nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml b/nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..aa17b280
--- /dev/null
+++ b/nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-20.ladok.umu.se/ecs-sp">
+
+ <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://nya-20.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2nk4XWTmn1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4
+MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8pLu2n6wDBw+3YzOsX7f9ue07z1oesWK
+WLQIG28pNuweFDsfhRZtzrSe/3r0Ong82J/t6ElnA1rr731Ko3sqHbMWMqCd14eA
+px6YVukOWA4xs8sPXPM3PHR6f9gnmyvSm7KW+gLqhQgIx3ioPQGgzkcLZDM0pI9m
+t0KerV7zwoRlNVsUn4oky1gsidDLPuLn3GWKyoXzcUK4x5LCfx4S18PSwW/OAerX
+5YbcI4b79RD9Ykr1cGtZZAb85vCRtcIfp+d4zm6hm1yVTGuItgpA8ZX18rxvUXgT
+10q8/GtmDf3tVYGXDdKZ3Tr4De8uYwRhaqjCrbm/blGtkK3utdJcrwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTnXAgZ+ObomUUo/1YKrNLy
+tGbA5DANBgkqhkiG9w0BAQUFAAOCAQEA2BQwjPjXYQRGXzaom2OYLAXZNBRPmr99
+Toyrpjuwp8SdDJk7Zw7kslGw+edjoB4RnbvLPpvPUxMSKLUKM9kCD3qY5MFg82p9
+rp3Qv+CAeNCWJnzok9IvuRXKLy0MUCMnrN53pqe0Sp9jxO2vyrhp+qCdKOFFb1Mk
+FRjcMlkpr42qhRIPGRa+JHr4WrGEeKnJ3O4ihESU4yc86HpHXCnHxyR3skwtUib9
+yCbdSne4A51XdcJlkgt0sNtDGt5WM0Q/9YxgPeYp6Ja5jeNobUyW4V18DNf3NlYq
+DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
+</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://nya-20.ladok.umu.se/ecs-sp</ds:KeyName>
+ <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJ2nk4XWTmn1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI0WhcNMjEwMjA4
+MDYzMDI0WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8pLu2n6wDBw+3YzOsX7f9ue07z1oesWK
+WLQIG28pNuweFDsfhRZtzrSe/3r0Ong82J/t6ElnA1rr731Ko3sqHbMWMqCd14eA
+px6YVukOWA4xs8sPXPM3PHR6f9gnmyvSm7KW+gLqhQgIx3ioPQGgzkcLZDM0pI9m
+t0KerV7zwoRlNVsUn4oky1gsidDLPuLn3GWKyoXzcUK4x5LCfx4S18PSwW/OAerX
+5YbcI4b79RD9Ykr1cGtZZAb85vCRtcIfp+d4zm6hm1yVTGuItgpA8ZX18rxvUXgT
+10q8/GtmDf3tVYGXDdKZ3Tr4De8uYwRhaqjCrbm/blGtkK3utdJcrwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjAubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+MC5sYWRvay51bXUuc2UvZWNzLXNwMB0GA1UdDgQWBBTnXAgZ+ObomUUo/1YKrNLy
+tGbA5DANBgkqhkiG9w0BAQUFAAOCAQEA2BQwjPjXYQRGXzaom2OYLAXZNBRPmr99
+Toyrpjuwp8SdDJk7Zw7kslGw+edjoB4RnbvLPpvPUxMSKLUKM9kCD3qY5MFg82p9
+rp3Qv+CAeNCWJnzok9IvuRXKLy0MUCMnrN53pqe0Sp9jxO2vyrhp+qCdKOFFb1Mk
+FRjcMlkpr42qhRIPGRa+JHr4WrGEeKnJ3O4ihESU4yc86HpHXCnHxyR3skwtUib9
+yCbdSne4A51XdcJlkgt0sNtDGt5WM0Q/9YxgPeYp6Ja5jeNobUyW4V18DNf3NlYq
+DOSyzgIFEpaeLyD5DnxZg0kXivNtZUkwoEAm28f1c23IGkR56qggbA==
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..1306ce15
--- /dev/null
+++ b/nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<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://nya-20.ladok.umu.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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI1WhcNMjEwMjA4MDYzMDI1WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV5yYE7pHl+mhfL2AUI3QMIg2gmaQ/44tTxIaWDtQg9z8UeN8ibluUfEc6lkIA+jbNA1xnMLakYBrZN33kXxrMCAwEAAaN/MH0wHQYDVR0OBBYEFGjiIrBajrSw7efSkaJcGjUGXTXUME4GA1UdIwRHMEWAFGjiIrBajrSw7efSkaJcGjUGXTXUoSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAuRq0MZmH8CswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHpIf59NfX6x02q/ztorkloPQl27yXwnDUEDMn/zDE8+Wszjz3HrrrZD33AHsvNyqF2trnC4VyPKaIyCtCkt7Z8=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/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://nya-20.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:449/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">studera.nu</shibmd:Scope>
+ </Extensions>
+
+ <KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJALkatDGZh/ArMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDI1WhcNMjEwMjA4MDYzMDI1WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMV5yYE7pHl+mhfL2AUI3QMIg2gmaQ/44tTxIaWDtQg9z8UeN8ibluUfEc6lkIA+jbNA1xnMLakYBrZN33kXxrMCAwEAAaN/MH0wHQYDVR0OBBYEFGjiIrBajrSw7efSkaJcGjUGXTXUME4GA1UdIwRHMEWAFGjiIrBajrSw7efSkaJcGjUGXTXUoSKkIDAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlggkAuRq0MZmH8CswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAHpIf59NfX6x02q/ztorkloPQl27yXwnDUEDMn/zDE8+Wszjz3HrrrZD33AHsvNyqF2trnC4VyPKaIyCtCkt7Z8=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-20.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
+
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:8448/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/nya-1.0/shib-idp-test.oru.se.xml b/nya-1.0/shib-idp-test.oru.se.xml
index 653cc762..d05bfe49 100644
--- a/nya-1.0/shib-idp-test.oru.se.xml
+++ b/nya-1.0/shib-idp-test.oru.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://shib-idp-test.oru.se/idp/shibboleth"
- 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">
+<?xml version="1.0"?>
+<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://shib-idp-test.oru.se/idp/shibboleth">
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -38,28 +35,20 @@ vs6Y0aXUmx4uTVjZQtbc
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.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://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.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">
@@ -96,15 +85,13 @@ vs6Y0aXUmx4uTVjZQtbc
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.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> \ No newline at end of file
+</EntityDescriptor>
diff --git a/nya-1.0/shibboleth.antagning.se.xml b/nya-1.0/shibboleth.antagning.se.xml
index 66573055..d1b9c806 100644
--- a/nya-1.0/shibboleth.antagning.se.xml
+++ b/nya-1.0/shibboleth.antagning.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://shibboleth.antagning.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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.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">
@@ -20,28 +17,20 @@ MIIBwjCCAWygAwIBAgIJALANRraT06m8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xl
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.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.antagning.se/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.antagning.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.antagning.se/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.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">
@@ -60,15 +49,13 @@ MIIBwjCCAWygAwIBAgIJALANRraT06m8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xl
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.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>
+</EntityDescriptor>
diff --git a/nya-1.0/shibboleth.testa.antagning.se.xml b/nya-1.0/shibboleth.testa.antagning.se.xml
index 89210223..a0eb3c3d 100644
--- a/nya-1.0/shibboleth.testa.antagning.se.xml
+++ b/nya-1.0/shibboleth.testa.antagning.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://shibboleth.testa.antagning.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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">
@@ -20,28 +17,20 @@ MIIB1DCCAX6gAwIBAgIJAMyW2nmo1EmXMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
</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: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"/>
+ <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: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" 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-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" />
+ <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">
@@ -60,15 +49,13 @@ MIIB1DCCAX6gAwIBAgIJAMyW2nmo1EmXMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
</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: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" />
+ <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>
+</EntityDescriptor>
diff --git a/nya-1.0/shibboleth.testb.antagning.se.xml b/nya-1.0/shibboleth.testb.antagning.se.xml
index 2cf50438..a965b686 100644
--- a/nya-1.0/shibboleth.testb.antagning.se.xml
+++ b/nya-1.0/shibboleth.testb.antagning.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://shibboleth.testb.antagning.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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">
@@ -20,28 +17,20 @@ MIIB1DCCAX6gAwIBAgIJAJWqRoJgmXcqMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
</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: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"/>
+ <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: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" 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-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" />
+ <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">
@@ -60,11 +49,9 @@ MIIB1DCCAX6gAwIBAgIJAJWqRoJgmXcqMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
</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: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" />
+ <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>
@@ -80,4 +67,4 @@ MIIB1DCCAX6gAwIBAgIJAJWqRoJgmXcqMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
<EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
</ContactPerson>
-</EntityDescriptor>
+</EntityDescriptor>
diff --git a/nya-1.0/shibboleth.testc.ladok.umu.se.xml b/nya-1.0/shibboleth.testc.ladok.umu.se.xml
index e6e96b59..d09e0362 100644
--- a/nya-1.0/shibboleth.testc.ladok.umu.se.xml
+++ b/nya-1.0/shibboleth.testc.ladok.umu.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://shibboleth.testc.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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.testc.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.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.testc.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testc.ladok.umu.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">
@@ -60,15 +49,13 @@ MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testc.ladok.umu.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>
+</EntityDescriptor>
diff --git a/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
index 204fa703..57d1033e 100644
--- a/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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.testd.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.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.testd.ladok.umu.se:444/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.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>
+</EntityDescriptor>
diff --git a/nya-1.0/vhs-dev01.dyndns.org.xml b/nya-1.0/vhs-dev01.dyndns.org.xml
index 24b7f0df..a12989e5 100644
--- a/nya-1.0/vhs-dev01.dyndns.org.xml
+++ b/nya-1.0/vhs-dev01.dyndns.org.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f927d9a46ed62f57f934aec3a7e7b0d9" entityID="https://vhs-dev01.dyndns.org/shibboleth-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vhs-dev01.dyndns.org/shibboleth-sp">
<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">
@@ -64,4 +64,4 @@ wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/vhs-shib.no-ip.org.xml b/nya-1.0/vhs-shib.no-ip.org.xml
index 9e0ee63f..160ce49b 100644
--- a/nya-1.0/vhs-shib.no-ip.org.xml
+++ b/nya-1.0/vhs-shib.no-ip.org.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_82c9ed67d7543f55d9dbc8e9484b4dfa" entityID="https://vhs-shib.no-ip.org/shibboleth-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vhs-shib.no-ip.org/shibboleth-sp">
<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">
@@ -72,4 +72,4 @@ wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/wb11.ladok.umu.se-aw-sp.xml b/nya-1.0/wb11.ladok.umu.se-aw-sp.xml
index 944a7fb9..664aec7f 100644
--- a/nya-1.0/wb11.ladok.umu.se-aw-sp.xml
+++ b/nya-1.0/wb11.ladok.umu.se-aw-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_90d1c7906b03da518425c6459f69ab49" entityID="https://wb11.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb11.ladok.umu.se/aws-sp">
<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">
@@ -73,4 +73,4 @@ r47Cpg6APAhpPp1KRCo+dy+2rnvbmWi8LukIaSt25UI=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/wb11.ladok.umu.se-dw-idp.xml b/nya-1.0/wb11.ladok.umu.se-dw-idp.xml
index 020135dc..4d53ef4a 100644
--- a/nya-1.0/wb11.ladok.umu.se-dw-idp.xml
+++ b/nya-1.0/wb11.ladok.umu.se-dw-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://wb11.ladok.umu.se/dw-idp"
- 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">
+<?xml version="1.0"?>
+<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://wb11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/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://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:451/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:451/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAI1RsMSE9pW+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://wb11.ladok.umu.se:8450/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8450/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>
+</EntityDescriptor>
diff --git a/nya-1.0/wb11.ladok.umu.se-dw-sp.xml b/nya-1.0/wb11.ladok.umu.se-dw-sp.xml
index fab2772f..6e162f5d 100644
--- a/nya-1.0/wb11.ladok.umu.se-dw-sp.xml
+++ b/nya-1.0/wb11.ladok.umu.se-dw-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_03b0db013689ff58954ebd42d932ba26" entityID="https://wb11.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wb11.ladok.umu.se/ecs-sp">
<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">
@@ -73,4 +73,4 @@ rc/DV3C2sj0TQkCAZuxvmmM4YpmAOJ7QMQzUUY4sOHU=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml b/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
index 094a0999..bbb7cf8b 100644
--- a/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
+++ b/nya-1.0/wb11.ladok.umu.se-shibboleth-idp.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://wb11.ladok.umu.se/shibboleth-idp"
- 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">
+<?xml version="1.0"?>
+<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://wb11.ladok.umu.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">
@@ -20,28 +17,20 @@ MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/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://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO" />
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wb11.ladok.umu.se:449/idp/profile/Shibboleth/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/POST-SimpleSign/SSO"/>
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO" />
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:449/idp/profile/SAML2/Redirect/SSO"/>
</IDPSSODescriptor>
<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -60,15 +49,13 @@ MIIBrjCCAVigAwIBAgIJAP60Z2/V7LjEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEXdiMTEubGFk
</ds:KeyInfo>
</KeyDescriptor>
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://wb11.ladok.umu.se:8448/idp/profile/SAML2/SOAP/AttributeQuery" />
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:8448/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>
+</EntityDescriptor>
diff --git a/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml b/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
index 6c1c1859..77564581 100644
--- a/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_afe580625169eaa817cbf188f35fff4a" entityID="https://www.antagning.testc.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testc.ladok.umu.se/ecs-sp">
<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">
@@ -75,4 +75,4 @@ LzX/iUE2AvRGsOX+N4Vn5VY0pW1fnhwktabz0IkjgIFrqZAD
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml b/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
index b95ab8b2..705fcc89 100644
--- a/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
+++ b/nya-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_c003f57c78894a8941a37580f4686cab" entityID="https://www.antagning.testd.ladok.umu.se/ecs-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testd.ladok.umu.se/ecs-sp">
<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">
@@ -75,4 +75,4 @@ s4pYYmjhHGe8qqvPTOwNFZC2hO/RVJQ19FanleFnXSQQn4DV
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/www.studera.testa.antagning.se.xml b/nya-1.0/www.studera.testa.antagning.se.xml
index 448701b9..0d464243 100644
--- a/nya-1.0/www.studera.testa.antagning.se.xml
+++ b/nya-1.0/www.studera.testa.antagning.se.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f78cf1409dad834cc66c1886fec5f8de" entityID="https://www.studera.testa.antagning.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testa.antagning.se/aws-sp">
<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">
@@ -75,4 +75,4 @@ RjgZQIDGhisNo2gnk7rDXoas4t/uGKzbzpxI9jjGdlgvJF8L
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testa.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml b/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
index ffffea3e..fe585f61 100644
--- a/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_657b746b88648bb64eb66bfb7cf15bad" entityID="https://www.studera.testc.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testc.ladok.umu.se/aws-sp">
<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">
@@ -75,4 +75,4 @@ Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml b/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
index ec2c2dcd..522c62ce 100644
--- a/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
+++ b/nya-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml
@@ -1,5 +1,5 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_865a35cbbb7971f7bb90ff26433562ea" entityID="https://www.studera.testd.ladok.umu.se/aws-sp">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testd.ladok.umu.se/aws-sp">
<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">
@@ -75,4 +75,4 @@ dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>