1 files changed, 40 insertions, 83 deletions
diff --git a/swamid-2.0/pilot.idp.eduid.se-idp.xml b/swamid-2.0/pilot.idp.eduid.se-idp.xml
index 064239b8..46fd3c53 100644
--- a/swamid-2.0/pilot.idp.eduid.se-idp.xml
+++ b/swamid-2.0/pilot.idp.eduid.se-idp.xml
@@ -1,83 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://pilot.idp.eduid.se/idp.xml">
-  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:Scope regexp="false">eduid.se</ns1:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">eduID PILOT</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduID PILOT</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">eduID PILOT</mdui:Description>
-        <mdui:Description xml:lang="en">eduID PILOT</mdui:Description>
-      </mdui:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIICuDCCAaACCQCnqk9TeP+LdTANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNp
-ZHAtdHVnLTJhLmVkdWlkLnNlMB4XDTEzMTExMTA3MzMzNFoXDTIzMTEwOTA3MzMz
-NFowHjEcMBoGA1UEAxMTaWRwLXR1Zy0yYS5lZHVpZC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBANmhMFj7praIWedLu2n8X0lTuyUwM88t/c14bVcd
-b9MHIXq2mTQgA37J8aUcctO7Mv2+3eajj7UooCZFs+GxEKuwEmdI4VnVjnL/D/o3
-fGJe2Vpmjj1S33lUjoEBU+LKFIDMLmWq/t4bflJUmOlAotcqootX8R+sr98NUV6b
-CZoc/wB1i68iPtdcRzs0W30CMIJ1uvPlFA54Huaouu/VSmxd0BIuXKHRqrECB7ga
-0r8FO15I+TJzQz32EaFmobrTTv7gD0F1BhbDtkBpT05QqJqOtETZcBQHQ5ieUieN
-AGTzcSL9i8DXT6j2Pt7/gPdIe31/CEEl2v8yb9NU26/EFWMCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEApn4kRY0uRUDBscCb4180UDZU12nmlC80rB8hYVF1hfoJfbZh
-KGeM8eyxJLq8bnPF0Wd0wMd5dM3GzEhjmr9dAVUgzUDkuZOsP0PrdiNxK5W5h2YY
-xBFyBKzGh/wfMsMqpHvgUyEH1nIYWjktotfmAIyjSfC7m+tTQHV0kEEjF6FFlcDT
-249zlmum8eVqUcv8RyFJ+6ocI3lQc0JuwNyPhSM44IHn06KzZTs8TpWZEXiK80pG
-TQDtZDNtreWxytVr3P7IBo5uC7tzZcFjMO3nIn1GITGsv6ChQKOpgHN1qJxT4+Sk
-FmNzSOp/30cJWnToA9gCBDCu8MHeL2ohl5a7xg==
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIICuDCCAaACCQCnqk9TeP+LdTANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNp
-ZHAtdHVnLTJhLmVkdWlkLnNlMB4XDTEzMTExMTA3MzMzNFoXDTIzMTEwOTA3MzMz
-NFowHjEcMBoGA1UEAxMTaWRwLXR1Zy0yYS5lZHVpZC5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBANmhMFj7praIWedLu2n8X0lTuyUwM88t/c14bVcd
-b9MHIXq2mTQgA37J8aUcctO7Mv2+3eajj7UooCZFs+GxEKuwEmdI4VnVjnL/D/o3
-fGJe2Vpmjj1S33lUjoEBU+LKFIDMLmWq/t4bflJUmOlAotcqootX8R+sr98NUV6b
-CZoc/wB1i68iPtdcRzs0W30CMIJ1uvPlFA54Huaouu/VSmxd0BIuXKHRqrECB7ga
-0r8FO15I+TJzQz32EaFmobrTTv7gD0F1BhbDtkBpT05QqJqOtETZcBQHQ5ieUieN
-AGTzcSL9i8DXT6j2Pt7/gPdIe31/CEEl2v8yb9NU26/EFWMCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEApn4kRY0uRUDBscCb4180UDZU12nmlC80rB8hYVF1hfoJfbZh
-KGeM8eyxJLq8bnPF0Wd0wMd5dM3GzEhjmr9dAVUgzUDkuZOsP0PrdiNxK5W5h2YY
-xBFyBKzGh/wfMsMqpHvgUyEH1nIYWjktotfmAIyjSfC7m+tTQHV0kEEjF6FFlcDT
-249zlmum8eVqUcv8RyFJ+6ocI3lQc0JuwNyPhSM44IHn06KzZTs8TpWZEXiK80pG
-TQDtZDNtreWxytVr3P7IBo5uC7tzZcFjMO3nIn1GITGsv6ChQKOpgHN1qJxT4+Sk
-FmNzSOp/30cJWnToA9gCBDCu8MHeL2ohl5a7xg==
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pilot.idp.eduid.se/slo/soap"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/slo/post"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/slo/redirect"/>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/sso/redirect"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pilot.idp.eduid.se/sso/art"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">eduID PILOT</ns0:OrganizationName>
-    <ns0:OrganizationName xml:lang="sv">eduID PILOT</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID PILOT</ns0:OrganizationDisplayName>
-    <ns0:OrganizationDisplayName xml:lang="sv">eduID PILOT</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
-    <ns0:OrganizationURL xml:lang="sv">http://www.eduid.se/</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>eduID</ns0:GivenName>
-    <ns0:SurName>developers</ns0:SurName>
-    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
+<?xml version='1.0' encoding='UTF-8'?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://pilot.idp.eduid.se/idp.xml"><ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:Extensions><ns1:Scope regexp="false">eduid.se</ns1:Scope></ns0:Extensions><ns0:KeyDescriptor use="encryption"><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy
+MDEzMTIwMi5pZHAuZWR1aWQuc2UwHhcNMTMxMjAyMDc0MjM2WhcNMTYxMjAxMDc0
+MzI5WjAgMR4wHAYDVQQDExUyMDEzMTIwMi5pZHAuZWR1aWQuc2UwggFSMA0GCSqG
+SIb3DQEBAQUAA4IBPwAwggE6AoIBMQDBUWjILLi4wc4It2A1IJHOx1ho87XAYYqR
+GPXGZg978+sJsesZamPR7wnxqYnXng+lCrKO3xEtrLE1JxzrEGY4xUMtnVOJmwgZ
+G8+TVmppZsmIu/sQd0+uF+fFAc9BgYx+xL/KEpJLDM/BaoQnt5AIz1L8iG3L6hur
+D8/79EN4Bp8tNG1WcX5Y8TjNk+4V9kd/GGZKaABH79aq2gD5W3F/j/A66b/qByq2
+LrbCZi1C9ED8X3oFeKXAQd/r82koj8ErKAaPfQXa6oxBn+hFwJ53bC4ixW84gOlI
+oAZovK7uAE9xBoJOoW86rGRfFhJy7Jl41JqsjbOXGwKG0Ze4i00yJskiNWDiZh5n
+ZgxnTY9vu1JMEIoVEhdaoeuXThUidFcHUKoGgfq8iQHIh9ehqhFpAgMBAAGjQDA+
+MAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUOJHQvHUg
+3gPXPmJFWbX+GzVCxWEwDQYJKoZIhvcNAQELBQADggExAIqLh7pcjkYAr3n3msYf
+PRasAPR+5OIdi7DSDNpPaPQnlSTGz0XwesxUvwhTuir7SDuqOzhoTW07jM8p8GQI
+1cxdaHxnaxF+O5iNkU5Pgx0XhyktXfGeB4uhB33bULN0SfpgaEyyXbOGTRz06Th4
+3AW90cP+5odC/z+yHhcOHq4VcdOg3jZZtTBghQ08u3i7cJLIG5Auc0PZb37hgLRy
+lAKHUrahuhbPDQhFjBwBX6rmRlDlMqNLhDdmlNPxg6xUbNpJIi6OnG/YpVRjbgcg
+1JUccanKdjA79iR/QeMGaJHmBm/iVTmq4XQSaeBi3nfkTrxZdHD+UsP7TXorwD9Y
+p5fHVO1o2XawoMuliRxlRkSbfW79b1XeKXBkV93clVkWc4M2VxBAsaT6yEwOLdif
+7js=
+</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns0:KeyDescriptor><ns0:KeyDescriptor use="signing"><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy
+MDEzMTIwMi5pZHAuZWR1aWQuc2UwHhcNMTMxMjAyMDc0MjM2WhcNMTYxMjAxMDc0
+MzI5WjAgMR4wHAYDVQQDExUyMDEzMTIwMi5pZHAuZWR1aWQuc2UwggFSMA0GCSqG
+SIb3DQEBAQUAA4IBPwAwggE6AoIBMQDBUWjILLi4wc4It2A1IJHOx1ho87XAYYqR
+GPXGZg978+sJsesZamPR7wnxqYnXng+lCrKO3xEtrLE1JxzrEGY4xUMtnVOJmwgZ
+G8+TVmppZsmIu/sQd0+uF+fFAc9BgYx+xL/KEpJLDM/BaoQnt5AIz1L8iG3L6hur
+D8/79EN4Bp8tNG1WcX5Y8TjNk+4V9kd/GGZKaABH79aq2gD5W3F/j/A66b/qByq2
+LrbCZi1C9ED8X3oFeKXAQd/r82koj8ErKAaPfQXa6oxBn+hFwJ53bC4ixW84gOlI
+oAZovK7uAE9xBoJOoW86rGRfFhJy7Jl41JqsjbOXGwKG0Ze4i00yJskiNWDiZh5n
+ZgxnTY9vu1JMEIoVEhdaoeuXThUidFcHUKoGgfq8iQHIh9ehqhFpAgMBAAGjQDA+
+MAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUOJHQvHUg
+3gPXPmJFWbX+GzVCxWEwDQYJKoZIhvcNAQELBQADggExAIqLh7pcjkYAr3n3msYf
+PRasAPR+5OIdi7DSDNpPaPQnlSTGz0XwesxUvwhTuir7SDuqOzhoTW07jM8p8GQI
+1cxdaHxnaxF+O5iNkU5Pgx0XhyktXfGeB4uhB33bULN0SfpgaEyyXbOGTRz06Th4
+3AW90cP+5odC/z+yHhcOHq4VcdOg3jZZtTBghQ08u3i7cJLIG5Auc0PZb37hgLRy
+lAKHUrahuhbPDQhFjBwBX6rmRlDlMqNLhDdmlNPxg6xUbNpJIi6OnG/YpVRjbgcg
+1JUccanKdjA79iR/QeMGaJHmBm/iVTmq4XQSaeBi3nfkTrxZdHD+UsP7TXorwD9Y
+p5fHVO1o2XawoMuliRxlRkSbfW79b1XeKXBkV93clVkWc4M2VxBAsaT6yEwOLdif
+7js=
+</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns0:KeyDescriptor><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pilot.idp.eduid.se/slo/soap" /><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/slo/post" /><ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/slo/redirect" /><ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat><ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/sso/redirect" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/sso/post" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pilot.idp.eduid.se/sso/art" /></ns0:IDPSSODescriptor><ns0:Organization><ns0:OrganizationName xml:lang="en">eduID PILOT</ns0:OrganizationName><ns0:OrganizationDisplayName xml:lang="en">eduID PILOT</ns0:OrganizationDisplayName><ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL></ns0:Organization><ns0:ContactPerson contactType="technical"><ns0:GivenName>eduID</ns0:GivenName><ns0:SurName>developers</ns0:SurName><ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress></ns0:ContactPerson><ns0:ContactPerson contactType="support"><ns0:GivenName>Support</ns0:GivenName><ns0:EmailAddress>support@eduid.se</ns0:EmailAddress></ns0:ContactPerson></ns0:EntityDescriptor>