1 files changed, 16 insertions, 24 deletions
diff --git a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
index 87fce1d4..0d802fee 100644
--- a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
@@ -9,6 +9,10 @@
         <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
@@ -43,8 +47,7 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUDopqrwr+8ysNjsx8WcAQU0xgFqYwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUDopqrwr+8ysNjsx8WcAQU0xgFqYwDQYJKoZIhvcNAQEL
 BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
 MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
 c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSfUra2csPm7zfml2+
@@ -61,16 +64,14 @@ xBwVnyzTupIJMl0pW7XEHzVEWStpn69m+iNFtDuCe8gVvILI0dRt1NVUD/+b3d1U
 /QePhM43hJVGWi7/yyP12INV98P4HdZ91VMxafGzFVCh/cgLjYxwVaAYt0kCzZqE
 oAK9ajxQTMEz7h5ebJDfi+eydnDmzUFuFYzjB4CIPs0YLvyr5R1wXOxzZcpPE7c5
 qjqmAlpXZIozlPXNuM5NG2qX5fs+okW0ZvDzp7uGthyxxTchBR8PxTfSnE2ImX2a
-Q2DB2f7ifMpnsvw=
-                        </ds:X509Certificate>
+Q2DB2f7ifMpnsvw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
 CwUAMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4uc2UwHhcNMTYwMzE0MTA0
 ODMyWhcNMzYwMzE0MTA0ODMyWjAeMRwwGgYDVQQDDBNtaXVuaWRwdGVzdC5taXVu
 LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4EPO2E98M79WKFHy
@@ -87,16 +88,14 @@ RHzNHB3g0oa/xH+APxLbP64FMvDrJAPFDsltRX97C9UyO47rBL983Jcjo20fjCt1
 03xMipYa9aYc6miUSXKSP0zLu8XoyRo8Vlx0+4y1hI1B/vfgw2I850thSfM/TepO
 eHLpC5j1cjhz+omgj8KtOu4iwRShXmOTb3/MPKYQ0BezIuI99QfavE3jkdVg4+bb
 sEjpTEgCNeNotsnug8EzSf3jMac7QVsKk/ZUjpMUiH1QWeXQSzpkT+BfEjcXUm23
-p8Zy6HNa1RvGgW8P
-                        </ds:X509Certificate>
+p8Zy6HNa1RvGgW8P</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
 BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
 MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
 c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgqMKF+EDtjw74HWSy
@@ -113,8 +112,7 @@ FLqNffN26y4k6EYg4XVGq5u8SmEwDktTn4wRJyj4NN9cqg3EZbw7wa10jTVTGEWm
 13Hf0TEi2qAkU3Xb8K7hHDy//BnKHo1FZLcIPMUGrIpaCl32klb5fAwvE+E6QgCB
 aFup4A/f+gTnofyIo1gi8TmMs/7v+A5Ty39VdmU15eXvA2TBhGEDFmVAQWnZvSQ2
 YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
-7RI4YGkyabhUuiM=
-                        </ds:X509Certificate>
+7RI4YGkyabhUuiM=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -133,8 +131,7 @@ YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUDopqrwr+8ysNjsx8WcAQU0xgFqYwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUDopqrwr+8ysNjsx8WcAQU0xgFqYwDQYJKoZIhvcNAQEL
 BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
 MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
 c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSfUra2csPm7zfml2+
@@ -151,16 +148,14 @@ xBwVnyzTupIJMl0pW7XEHzVEWStpn69m+iNFtDuCe8gVvILI0dRt1NVUD/+b3d1U
 /QePhM43hJVGWi7/yyP12INV98P4HdZ91VMxafGzFVCh/cgLjYxwVaAYt0kCzZqE
 oAK9ajxQTMEz7h5ebJDfi+eydnDmzUFuFYzjB4CIPs0YLvyr5R1wXOxzZcpPE7c5
 qjqmAlpXZIozlPXNuM5NG2qX5fs+okW0ZvDzp7uGthyxxTchBR8PxTfSnE2ImX2a
-Q2DB2f7ifMpnsvw=
-                        </ds:X509Certificate>
+Q2DB2f7ifMpnsvw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
 CwUAMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4uc2UwHhcNMTYwMzE0MTA0
 ODMyWhcNMzYwMzE0MTA0ODMyWjAeMRwwGgYDVQQDDBNtaXVuaWRwdGVzdC5taXVu
 LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4EPO2E98M79WKFHy
@@ -177,16 +172,14 @@ RHzNHB3g0oa/xH+APxLbP64FMvDrJAPFDsltRX97C9UyO47rBL983Jcjo20fjCt1
 03xMipYa9aYc6miUSXKSP0zLu8XoyRo8Vlx0+4y1hI1B/vfgw2I850thSfM/TepO
 eHLpC5j1cjhz+omgj8KtOu4iwRShXmOTb3/MPKYQ0BezIuI99QfavE3jkdVg4+bb
 sEjpTEgCNeNotsnug8EzSf3jMac7QVsKk/ZUjpMUiH1QWeXQSzpkT+BfEjcXUm23
-p8Zy6HNa1RvGgW8P
-                        </ds:X509Certificate>
+p8Zy6HNa1RvGgW8P</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
 BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
 MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
 c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgqMKF+EDtjw74HWSy
@@ -203,8 +196,7 @@ FLqNffN26y4k6EYg4XVGq5u8SmEwDktTn4wRJyj4NN9cqg3EZbw7wa10jTVTGEWm
 13Hf0TEi2qAkU3Xb8K7hHDy//BnKHo1FZLcIPMUGrIpaCl32klb5fAwvE+E6QgCB
 aFup4A/f+gTnofyIo1gi8TmMs/7v+A5Ty39VdmU15eXvA2TBhGEDFmVAQWnZvSQ2
 YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
-7RI4YGkyabhUuiM=
-                        </ds:X509Certificate>
+7RI4YGkyabhUuiM=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>