1 files changed, 60 insertions, 30 deletions
diff --git a/swamid-2.0/testaprisma.vr.se-shibboleth.xml b/swamid-2.0/testaprisma.vr.se-shibboleth.xml
index 5ae827a0..72d57790 100644
--- a/swamid-2.0/testaprisma.vr.se-shibboleth.xml
+++ b/swamid-2.0/testaprisma.vr.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <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://testaprisma.vr.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
@@ -26,12 +22,11 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="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">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testaprisma.vr.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testaprisma.vr.se/Shibboleth.sso/Login" index="1"/>
@@ -42,27 +37,64 @@ and do *NOT* provide it in real time to your partners.
         <mdui:Description xml:lang="en">Prisma is a joint portal used by several research funders.</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>testaprisma.vr.se</ds:KeyName>
+        <ds:KeyName>paportalweb1.ad.vr.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=testaprisma.vr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJALyDb0U/kwgyMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXRlc3RhcHJpc21hLnZyLnNlMB4XDTE0MDUwMjA4MzYwOFoXDTI0MDQyOTA4
-MzYwOFowHDEaMBgGA1UEAxMRdGVzdGFwcmlzbWEudnIuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6ojfwiDlOFQMYd/ENAcVUaW3YQ1k1L+JlE81K
-Z8ZZh796aWxwwVisbmZqBek/H6eNWpxLR//D77YEx8TwdmMzDuB9RbNLsbp28uu6
-UssH7qVUIdw5nnpEAywK+NGsLJbVEhrZerp8ydpAu5Qj9Th0WIiLThXiXc/9WH4S
-VeEkHD22LI1FjsgXQjlcVxyvyIDlHgnkzQmrUfwAtyVY67ASFEsy4SkJAeuGzi2I
-vMPrc938LPUANRHtJrECcbBUsmnpZBeU24DBdR5rYLL1BPjYrsWkyrHVciP/zT4j
-N+fvnJC1I8NflYhtdxQx2nJbHiNw1mvFt3jsAs6eeaLpwEbHAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXRlc3RhcHJpc21hLnZyLnNlMB0GA1UdDgQWBBRZtyMF+9cE8Bgi
-ypEcHApzkfy4CTANBgkqhkiG9w0BAQUFAAOCAQEAdruGJJ79YxJMkORE7Li8jATg
-s2+bU8dnTEDNls2RBfRYKlYHQg+mjtyYYdZR7qTy0aJibwofgo6ieXdX6Jg5eMU9
-/+93xCFYTPEofWj9pZy5BDx6AvxyhgQ9XjtdsMDphGMRoWTc92BGdNjAAw/Oag75
-H9PjoorE61MIqluiO6Pb/W+bE2mYgeIWsqsutJQfa6Duk9UjnVVYAMspkRyQ9Z0f
-JeN4ASzWWgxCEmOjT+bj6VFvnRwPDOlTi7paqdpasPoxKVSx/S/4bgpH23vNtu9b
-Dy3oscht7rhlGhTsIsDulx5tPZY9ZyOVoZ6d6RQxvIwExf5Tt7QW1w0i0Pb9xA==
+          <ds:X509SubjectName>CN=paportalweb1.ad.vr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEETCCAnmgAwIBAgIUB0IwVVanzUEr7mgTM1TrwM7ViREwDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAxMVcGFwb3J0YWx3ZWIxLmFkLnZyLnNlMB4XDTIwMDkxODEx
+MzgzM1oXDTMwMDkxNjExMzgzM1owIDEeMBwGA1UEAxMVcGFwb3J0YWx3ZWIxLmFk
+LnZyLnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAyVTaXAMhiiWh
+HAHdXQjeKalwxShtBF4fmX8KBENlQScaq4TbV+w3LD5Py9X972IGMYlgdG8q5/1J
+5ZOcoIoip8bndQIn6N7UzLNnmayY6HDq4Vhxd4SKun143SwG8RUdOCQvtdnRA6KV
+chAiQNrN7IiPb+GzHL9mG0+UbrnBHPgnVriidP4PtFsCjAoBqcPx4uKBVOwtwbA0
+rzuDMwQyg4UWg1le9Ory5ayzMLpToLoJbVBnkX4qiO23iqZ2l86iCKvBYrMXKEr5
+oBOpfQKn2xwo5FyQA6mj21AS2IGhVztAheC7QeYpHhlS6PVRE4XaIPIIKv2h7gux
+SJPxRQ/O72c2+y0hLubLxwsXr82nfrBXtpZ69NlOzZ3vGEPtSmM/73F8DocW0dY8
+L8f+LCvWSThuNsY8cQtU9KhPt7okog6ZAA7LpkgksWkPAS6dI+1IYW4XjNWTHebf
+MWOk4mgeb39y5B+LEOAb8zNu4eofoMCtB7qqJYyUtNP4gMj1l16xAgMBAAGjQzBB
+MCAGA1UdEQQZMBeCFXBhcG9ydGFsd2ViMS5hZC52ci5zZTAdBgNVHQ4EFgQUE2jU
+pRb9gVLYHVPAd698Gm90EnwwDQYJKoZIhvcNAQELBQADggGBAKZiH0gWI2dbuucR
+8tXvygire/B+thimNy4mpFHM13dlocUfMefq0SDuMbJ491skGnO1Hzi+kDVaq+P/
+iESv3SWCGkj3ob2qzY7yEWuRKG8fv5b2fRxvytzckKwfZHAvsu2+IQ7uUJh1bp3u
+Y+p3gH1wXdHrQQ9r8+qsnz/9DtiYbv5S4M0o7KD5aCipc9pcubvAGm16GkpHVX9e
+035VxW0Lac57NhzjInsyS6F+c1Zyc8hQaGkHgqM8Om3YVmE8vUeEb2enDdCjCNkt
+309clZoPDNDvdzhYislyPEHH7nXtXikADplqpKcLUiTqLcviWJbmStE+EDCajcvv
+aTbofC5nhsPqeRfpeMuI1Q+HRAyevgMdqkO5cL5Fkc3yKRQQC8y4CqpQqo3eHluV
+wHLl+6kOqGPXaX8QtYLM9I74UZUqPaUQ22CKvNU9QeCSJD5/kVHLziwffOzehsM4
+cTI3nzx6Q674+oEzvKloeGJxD8+1bYIg2QxSwgegso4F/00/Cw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>paportalweb1.ad.vr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=paportalweb1.ad.vr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEETCCAnmgAwIBAgIUTySP/hfK2w7NjcQySKEnUV+rLWgwDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAxMVcGFwb3J0YWx3ZWIxLmFkLnZyLnNlMB4XDTIwMDkxODEx
+MzgzMloXDTMwMDkxNjExMzgzMlowIDEeMBwGA1UEAxMVcGFwb3J0YWx3ZWIxLmFk
+LnZyLnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0hMGnNBFODCw
+Y6jwcJ9O8ndzYMwb+V/ti7Ax4Gi4ga1o//DqU3Q6yLp4DOhNjza29QjZwlTSCoww
+kICS+SoXbzA0ehuHltRWDGk3T4QqkWY1l80SDD5iNkzPbmDpVk7AeexVBRD7edJe
+CXGoAeoq5UJie8D9xrBjLJqUQlxPP9SMCLcUxq3mecBin/GU1A3djIMHA976q/Cr
+JwZGLfxhG5N/Lo4IORR/7s5LJnC16Df6vaI6EZFTcNGZ32oo9m91Yu8kaC/YJ2On
+ekd29Fft+RwPEmvMhxYCmhXQ+7OnFEvUYt1Vg0Bt6vOWBV3ChL2JP3XzPX7+mD1h
+a4exP4woVXIn0U1FDqg6ZsYotA32Oq0kN2PUC5FL0mQHf6L0kDPyMY9dw6sR3t+n
+GCRxBXpo9qUZ6MwlMiVZdFSeLQaZ3zDzZSdw77H6aIqKJXKZ8WRZvIkMK/sdEcfC
+PAD3EHvRPfhS5a6DjLEfZmch+QInaztVf1hJtmLqJ2esiOtxoT8HAgMBAAGjQzBB
+MCAGA1UdEQQZMBeCFXBhcG9ydGFsd2ViMS5hZC52ci5zZTAdBgNVHQ4EFgQUPDER
+43X3rufiWqQH5YModbufg18wDQYJKoZIhvcNAQELBQADggGBABV3RJDEGeFIDKf+
+iuoT8r2BbgYA3kNLc4EjM8BhK3NTEGBXvoEZjYTrhoBpzZl0jI++11d0nkzwkGGM
+Fg1PuPzmKolN3fFPKyUdbGmX6xS1zFuRAiv/gsXR6FsD0cVGFZWCATKU3jMlc1oF
+NrjjDZh+MTNle4u7bT1kSsuEXh7QnhpeUtax1uuLjqAc5aji0L6Ij+iFT5mOzUeo
+68z246MsjNziLWpPZvEWSulzifNUmvWelOnV8fzHE9NQ4Q0fR9S6bowvmxe0uZek
+21b4zVlZlGPZPmvMBxoUHM8pqt/SRh+oJX5fxq36MUKl30Scf+AsYU+jlMKL7K8E
+FIu0z9Eyk7k7U8/12PgPGdkDbdPrvA/AWyEi6swp1laKzftORbtzgNOYXdjzmtaP
+LM0W5O7oruEYEfvbqikYZoECbTJMxMKusqL7BgEQAEN2betkLEM8ZfcZGcHLEIlT
+AgJoWwDF9OqeNMtOrzHFyFvwpGX6JolU8V7FOsz5Wrh2qXvaMA==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -82,9 +114,7 @@ Dy3oscht7rhlGhTsIsDulx5tPZY9ZyOVoZ6d6RQxvIwExf5Tt7QW1w0i0Pb9xA==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testaprisma.vr.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testaprisma.vr.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>