1 files changed, 84 insertions, 84 deletions
diff --git a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
index 734022bd..aea1c055 100644
--- a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-sp.aco.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.eduid.at/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eduid.at/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">eduID.at Demo Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduID.at Demo Service</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</mdui:Description>
+        <mdui:Description xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Demo+SP</mdui:InformationURL>
+        <mdui:Logo width="195" height="94">https://www.aco.net/fileadmin/aconet/Logos/aconetlogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.eduid.at/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eduid.at/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">eduID.at Demo Service</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">eduID.at Demo Service</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</mdui:Description>
-          <mdui:Description xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Demo+SP</mdui:InformationURL>
-          <mdui:Logo width="195" height="94">https://www.aco.net/fileadmin/aconet/Logos/aconetlogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAObaiwc63DWQMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAObaiwc63DWQMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD3Rlc3Qtc3AuYWNvLm5ldDAeFw0wODA3MDkxMTQ1NTVaFw0xODA3MDcxMTQ1
 NTVaMBoxGDAWBgNVBAMTD3Rlc3Qtc3AuYWNvLm5ldDCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALZXEDbiffZnDnsWcJlVUBlaAyEycf+0Bjg/DjsQAz4l
@@ -47,57 +47,57 @@ ejLfUgi137jrXaP7jlGSL85aFIWTGoBT6IZu+qiVo8qbWY5EH+3gSIQYCYpfKuaJ
 6EbpYsqZ1tEg6tfUGJK4Ly87HHBCRNwDV9/85yGt+puwvjsPeaXELsGOpTaA8lGJ
 i0o8V/egkPa0mbqghudG9cwZluJCJSWxvxv7yersHIdedRwZyv7vSGu4FI4g39Km
 vNzoGHMHg8pOo6cx9Arah88V+SEsBxtCh3V9Fg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eduid.at/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SLO/POST"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="de">eduID.at Demo Service</md:ServiceName>
-        <md:ServiceName xml:lang="en">eduID.at Demo Service</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">ACOnet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ACOnet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>eduID.at</md:GivenName>
-      <md:SurName>Federation Operator</md:SurName>
-      <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>eduID.at</md:GivenName>
-      <md:SurName>Federation Operator</md:SurName>
-      <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>eduID.at</md:GivenName>
-      <md:SurName>Federation Operator</md:SurName>
-      <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eduid.at/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SLO/POST"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="de">eduID.at Demo Service</md:ServiceName>
+      <md:ServiceName xml:lang="en">eduID.at Demo Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">ACOnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ACOnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduID.at</md:GivenName>
+    <md:SurName>Federation Operator</md:SurName>
+    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>eduID.at</md:GivenName>
+    <md:SurName>Federation Operator</md:SurName>
+    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>eduID.at</md:GivenName>
+    <md:SurName>Federation Operator</md:SurName>
+    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>