2 files changed, 81 insertions, 4 deletions
diff --git a/swamid-2.0/idp.comanage.sunet.se-idp.xml b/swamid-2.0/idp.comanage.sunet.se-idp.xml
index ff64d23b..c1c7b1a1 100644
--- a/swamid-2.0/idp.comanage.sunet.se-idp.xml
+++ b/swamid-2.0/idp.comanage.sunet.se-idp.xml
@@ -9,8 +9,8 @@
     <saml:Extensions>
       <shibmd:Scope regexp="false">test.sunet.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SUNET Test IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET Test IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SUNET test IdP old</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SUNET Test IdP old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Testsystem för SUNET-anställdas inloggning</mdui:Description>
         <mdui:Description xml:lang="en">Test system for SUNET employees login</mdui:Description>
         <mdui:Logo height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
@@ -56,8 +56,8 @@ HJbyRQeO5J/RKe2busGducxQo6/KccmF
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/post"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SUNET Test IdP</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SUNET Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">SUNET Test IdP old</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET Test IdP old</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-2.0/idpaas.swamid.se-idp.xml b/swamid-2.0/idpaas.swamid.se-idp.xml
new file mode 100644
index 00000000..dbc7bad1
--- /dev/null
+++ b/swamid-2.0/idpaas.swamid.se-idp.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idpaas.swamid.se/Saml2IDP/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <saml:Extensions>
+      <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">SUNET Test IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SUNET Test IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testsystem för SUNET-anställdas inloggning</mdui:Description>
+        <mdui:Description xml:lang="en">Test system for SUNET employees login</mdui:Description>
+        <mdui:Logo height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>sunet.se</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </saml:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>
+MIIFFTCCAv2gAwIBAgIUMwC6Sv2X/IxC4PLzSK1zRUfQLsEwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMB4XDTE5MTAxNDEwNTYzNFoX
+DTI5MTAxMTEwNTYzNFowGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0WdTJhh5Lv34YqkWXjmav1xdeHye
+/2YdXc0gYNTIb4HyoWoejQoVuxoidpAVwEN0694j63IcLyAwEy6pOQn+BIEE2cAq
+QllWOLlNta+HRMvkjNohqaQk5IS/S3VPKMfvVv66oIcdzD5V/10HB9NxS+cpOqSF
+PPl89rrtP1Ef8QGK8yUwH2a3XKjNyzod4Xsp65fOP9uD4JveB/0CMD/7hlkkr2kJ
+c6Dehv4FMzspAt1otzuza6lwks68sKrooG6CUN4cULLTjAOv4T9nGA9jobaCr9JM
+7/+GOLtDOyG+ES7m+GbuWyuTE7f08Hel/kAc7rmHi+ZiGJdKPYHIvueOEHkah7Ch
+IWWQC6vZiJQoFxE2QCf6OdbrL3s2HZO2tAgqWHs8U+jjXcTd8arh4aBpvlfblJ11
+JLXsTV3P5ooMTFJ7iujYpGpuETxJZu5+FqJgaXrXSh5M3esGu9bLOBqLUi6G28nl
+dkgwO8VSCgQjx6wtt90/hlJOsSrHzpJy1D3mQETtCQfKQST1aoo2+9N5P0iIb+zl
+MHGKqxAxbQVyBt63hf2jTNAqb835AcycBof79lveKBHBt5gJCN3XIccGHJ/8/br1
+VkhuBlvxGaWEbTDPe+lWtN+5Lltbz9bzJLpRepSkCYoH/srZ19iD8tISJPtIhQqH
+Fmn9XgfMv8v7/XUCAwEAAaNTMFEwHQYDVR0OBBYEFK91jyAlLIP2Z0MSKCEcOnik
+ApT5MB8GA1UdIwQYMBaAFK91jyAlLIP2Z0MSKCEcOnikApT5MA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAG9r3QWTR0BslCWKKoq86RDO2fl8X+p/
+/nFQVPv78r97cS8Ihx+SvZ7yMDdgGEeI0Jhvijx6gtcFak4CVRJZP4Jpd9EL4sRT
+a6p6XEQcGqb8ZUL4zcU44YQgEm1op129oYPTSOFgthC+skMTOBcgVKYjmYNPMqHH
+NPtyvacYhnBKNPA2cPdNkITvjfZjDjGr0ZnDpwYhY2yQpOtakUXJ99W4Pptvbz2K
+dD+B1ndAYNOhub0yVzWQXPuQJtICBGpt3nUGMd3VOg0iQVfZqQNxhZ+putGWnjXq
+H9ZwZwx4ba9kgIYzphtIslLA48JKpvJ5VAVBBzr2czegQD4Wt+CmN/CHEw8IPDTB
+k0F69V/UZWjdKjCEwfWz0kXQiBsXWjOLAexpkPkezvbYaK4Bml36Yd/YObTqY/hO
+KG7YW8lWoKEQNQTI/OfPGbbkQtgaiQUFLI6WPiKPRAGFKxHdHJMT1p5r6fccNWJi
+WpVC8i+rNnoAoXbJdRkzlF8LpQUgl4to9K4/GLXi0AoypF9A6ABNcqLmxNShxkBw
+3Re+aaHugoOtHht9I7tfL3Y7qLh2/T3AQY1JiS0wx7M06IlWClacC1WEAZGBE6ff
+6wdFb/nCricrlu02DPq6qiET3vkHLTQravQx/uaGUhUwhDaTz1o5MmzHwvgryHtd
+Pn4CLMAvvHqQ
+          </ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpaas.swamid.se/Saml2SP/sso/redirect"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpaas.swamid.se/Saml2SP/sso/post"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET Test IdP</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>