1 files changed, 90 insertions, 95 deletions
diff --git a/swamid-interfederations-2.0/swamid.vr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/swamid.vr.se-idp-shibboleth.xml
index 75163969..ccf4cd11 100644
--- a/swamid-interfederations-2.0/swamid.vr.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/swamid.vr.se-idp-shibboleth.xml
@@ -1,38 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.vr.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet PRODTEST</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">The Swedish Research Council PRODTEST</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IDP at Swedish Research Council</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">vr vetenskapsrådet vrpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">vr the+swedish+research+council vrpunktse</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>vr.se</mdui:DomainHint>
-      </mdui:DiscoHints>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="sv">Vetenskapsrådet</mdui:DisplayName>
+          <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
+          <mdui:DisplayName xml:lang="en">The Swedish Research Council</mdui:DisplayName>
+          <mdui:Description xml:lang="en">IDP at Swedish Research Council</mdui:Description>
+          <mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
+          <mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
+          <mdui:Logo xml:lang="sv" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
+          <mdui:Logo xml:lang="en" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
+          <mdui:Keywords xml:lang="sv">vr vetenskapsrådet vrpunktse</mdui:Keywords>
+          <mdui:Keywords xml:lang="en">vr the+swedish+research+council vrpunktse</mdui:Keywords>
+        </mdui:UIInfo>
+        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DomainHint>vr.se</mdui:DomainHint>
+        </mdui:DiscoHints>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
 NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
@@ -51,13 +46,13 @@ r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
 UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
 spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
                         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
 BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
 MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
@@ -76,13 +71,13 @@ ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
 SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
 KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
                         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
 NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
@@ -101,25 +96,25 @@ zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
 mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
 ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
                         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.vr.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.vr.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.vr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.vr.se/idp/profile/Shibboleth/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.vr.se/idp/profile/SAML2/POST/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.vr.se/idp/profile/SAML2/Redirect/SSO"/>
+    </md:IDPSSODescriptor>
+    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
 NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
@@ -138,13 +133,13 @@ r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
 UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
 spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
                         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
 BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
 MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
@@ -163,13 +158,13 @@ ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
 SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
 KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
                         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
 NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
@@ -188,19 +183,19 @@ zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
 mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
 ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
                         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">VR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet PRODTEST</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council PRODTEST</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vr.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Robert Chrudina</md:SurName>
-    <md:EmailAddress>mailto:robert.chrudina@tieto.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">VR</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.vr.se</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="technical">
+      <md:SurName>Robert Chrudina</md:SurName>
+      <md:EmailAddress>mailto:robert.chrudina@tieto.com</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>