Resolved SWAMIDOPS-8486

1 files changed, 187 insertions, 68 deletions

diff --git a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
index 43df9205..c51d318d 100644
--- a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
@@ -1,23 +1,196 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-test.suni.se/adfs/services/trust">
-  <Extensions>
-    <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
-  </Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp-test.suni.se/adfs/services/trust">
+  <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-test.suni.se">
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC4jCCAcqgAwIBAgIQek/EaOs9V7VFR7XG3cPV/TANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLnQfl7WTniCN9Y4WD6FGtQTtfrU7cto9w/1p3lPZynmiYZ2XoVLCIFOjshhnTtUWSdj5ajAXEWkTE0wuLJKIffDblJbUcdxi1V9uOkHoytCRV7sN48hGm5ayu2aT6j6272R0P7iLhaoU5QR/AWsyo4A/UDRirGa/m0pJyyfhSuHqFmkl9f5voLZLvweHrgWj+ie1xkACeeiKnykKqLgBf4LI5z+PMlhMGbLTGsmH5+ljwUmBqiXh2FMG62//gOBDs7wq1iZIm1DV/4b7yKJrTJgStrgo7XVZfj9+BMbc3NRdYgL/WG6E4t6WP2rhtflDY9/xNm1l5nIW7Wd3+S760CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABc10A6vq9oVHSxmqh7+hwpT8l6eRZhiBDmNAGUovbLnXeytV02vZc6IXNEI72Qzhh6g0FiGSucxRTrUyMX9FtjR/vBwk16KSLQn0FNNBxqV8Wet9mE5R+1fPGWzulp8YQtz5J31xchGoMieJ7M+TLV1Od0iQSqa3/9pfVV35ui4kiPXSyFhUtvRAn+fvSi8RYg6DVB4IRUskLOEMlYRq1SH8JfaiCwdbd5IzDA7Pe60qxrPVOyBJRylfR770ubyJAxhIvfU2m2nKOw2jALD98jDjQ7/1Nli9kA7vdf2NsMUgR76qGczGepjF2l4MIpV22RwMVbfnVsaC0mTpHMdQkg==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <fed:TargetScopes>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/ls/</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>http://idp-test.suni.se/adfs/services/trust</Address>
+      </EndpointReference>
+    </fed:TargetScopes>
+    <fed:ApplicationServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+    </fed:ApplicationServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </RoleDescriptor>
+  <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-test.suni.se">
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC3DCCAcSgAwIBAgIQdLObATCTf61N9d9qj8ZV0zANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWUL0Drry/FB46wntV1iIOsBg6QqXrvDlCGaJ/O1JhJ2/ZeqACcCKPZySJSQ+0x5R3V9rbbI4an1JM20Bktjf0xmfT2+80QgGjvNi2W5drem+t7SOAvCBa8RvkYkY2lX/wee6bInkAlsAtQZ9o9ffgYVxlOUW+USR+7XT6F9wtTVrZSX2QK4whj9JWdyA/sQLgjeWU8WFN506KZERm3ua1wpV5EoCOnShIamGhfpgaRVNPI9pcyw0gwXeMdDfPYhfBFni1Tn9tLdsYj878P/3irKwkcTtC3VgYnKsI9U6XJzG5w1wfzTJEnSp9HVhF7UaFcEYTgb3sXunGKwz49ABsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQf4xSVepvO2OtF1AokPidv0o1RHYsmJjREfn/bJVV0SQKaYCUx75rPaPUEQTqY3vLdongoJmRaM2hudr5fF+iGRsvIAPoZQcESOZ55k9ff2Ix4yj3CrH93RCbiWDlx80xgjIP5NrsZsrq9YSV6IQCml77qAwYdg7LqeLie1rmgh59PnrIxKO9JoDp8ZYJV1fAaaEpnuqbmUlL51RFNHsyujvc3i991yHCifeDVseOZchZAafmnHHphfsUdlInrohcy4p9nFC8/DdUmipViTAvB6HVvU18lw9dUBU8D4m+RitudnecZdxABWfb4l63j+PhPHDmHS1AuWF0Shs5yrXBQ==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <fed:TokenTypesOffered>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
+    </fed:TokenTypesOffered>
+    <fed:ClaimTypesOffered>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="urn:mace:dir:attribute-def:eduPersonEntitlement" Optional="true">
+        <auth:DisplayName>eduPersonEntitlement</auth:DisplayName>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" Optional="true">
+        <auth:DisplayName>eduPersonScopedAffiliation</auth:DisplayName>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="urn:mace:dir:attribute-def:norEduPersonNIN" Optional="true">
+        <auth:DisplayName>norEduPersonNIN</auth:DisplayName>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="urn:mace:dir:attribute-def:vfu" Optional="true">
+        <auth:DisplayName>vfu</auth:DisplayName>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/cn" Optional="true">
+        <auth:DisplayName>cn</auth:DisplayName>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/displayname" Optional="true">
+        <auth:DisplayName>Display Name</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesOffered>
+    <fed:SecurityTokenServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/services/trust/2005/certificatemixed</Address>
+        <Metadata>
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
+              <wsx:MetadataReference>
+                <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp-test.suni.se/adfs/services/trust/mex</Address>
+              </wsx:MetadataReference>
+            </wsx:MetadataSection>
+          </Metadata>
+        </Metadata>
+      </EndpointReference>
+    </fed:SecurityTokenServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-test.suni.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </RoleDescriptor>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC4jCCAcqgAwIBAgIQek/EaOs9V7VFR7XG3cPV/TANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLnQfl7WTniCN9Y4WD6FGtQTtfrU7cto9w/1p3lPZynmiYZ2XoVLCIFOjshhnTtUWSdj5ajAXEWkTE0wuLJKIffDblJbUcdxi1V9uOkHoytCRV7sN48hGm5ayu2aT6j6272R0P7iLhaoU5QR/AWsyo4A/UDRirGa/m0pJyyfhSuHqFmkl9f5voLZLvweHrgWj+ie1xkACeeiKnykKqLgBf4LI5z+PMlhMGbLTGsmH5+ljwUmBqiXh2FMG62//gOBDs7wq1iZIm1DV/4b7yKJrTJgStrgo7XVZfj9+BMbc3NRdYgL/WG6E4t6WP2rhtflDY9/xNm1l5nIW7Wd3+S760CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABc10A6vq9oVHSxmqh7+hwpT8l6eRZhiBDmNAGUovbLnXeytV02vZc6IXNEI72Qzhh6g0FiGSucxRTrUyMX9FtjR/vBwk16KSLQn0FNNBxqV8Wet9mE5R+1fPGWzulp8YQtz5J31xchGoMieJ7M+TLV1Od0iQSqa3/9pfVV35ui4kiPXSyFhUtvRAn+fvSi8RYg6DVB4IRUskLOEMlYRq1SH8JfaiCwdbd5IzDA7Pe60qxrPVOyBJRylfR770ubyJAxhIvfU2m2nKOw2jALD98jDjQ7/1Nli9kA7vdf2NsMUgR76qGczGepjF2l4MIpV22RwMVbfnVsaC0mTpHMdQkg==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC3DCCAcSgAwIBAgIQdLObATCTf61N9d9qj8ZV0zANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWUL0Drry/FB46wntV1iIOsBg6QqXrvDlCGaJ/O1JhJ2/ZeqACcCKPZySJSQ+0x5R3V9rbbI4an1JM20Bktjf0xmfT2+80QgGjvNi2W5drem+t7SOAvCBa8RvkYkY2lX/wee6bInkAlsAtQZ9o9ffgYVxlOUW+USR+7XT6F9wtTVrZSX2QK4whj9JWdyA/sQLgjeWU8WFN506KZERm3ua1wpV5EoCOnShIamGhfpgaRVNPI9pcyw0gwXeMdDfPYhfBFni1Tn9tLdsYj878P/3irKwkcTtC3VgYnKsI9U6XJzG5w1wfzTJEnSp9HVhF7UaFcEYTgb3sXunGKwz49ABsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQf4xSVepvO2OtF1AokPidv0o1RHYsmJjREfn/bJVV0SQKaYCUx75rPaPUEQTqY3vLdongoJmRaM2hudr5fF+iGRsvIAPoZQcESOZ55k9ff2Ix4yj3CrH93RCbiWDlx80xgjIP5NrsZsrq9YSV6IQCml77qAwYdg7LqeLie1rmgh59PnrIxKO9JoDp8ZYJV1fAaaEpnuqbmUlL51RFNHsyujvc3i991yHCifeDVseOZchZAafmnHHphfsUdlInrohcy4p9nFC8/DdUmipViTAvB6HVvU18lw9dUBU8D4m+RitudnecZdxABWfb4l63j+PhPHDmHS1AuWF0Shs5yrXBQ==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-test.suni.se/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/" index="2"/>
+  </SPSSODescriptor>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Södertörns högskola - test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Södertörn University - test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Test-IDP för Södertörns högskola.(Endast för testverksamhet)</mdui:Description>
+        <mdui:Description xml:lang="en">Test-IDP for Södertörn University.(For Testing purposes only)</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sh.se/p3/ext/content.nsf/aget?openagent&amp;key=startsideportal_engelsk_1308725461229</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIEmzCCA4OgAwIBAgIRAPk+SXniS3T2At3wrsquxWEwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNDIwMDAwMDAwWhcNMTgwNDE5MjM1OTU5WjA+MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGTAXBgNVBAMTEGlkcC10ZXN0LnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrrCK7qc2FuRKTeSb4sUoKHR6R/o7WLS7ZHbxmcwhm1Vpmx3ToxSYo+nzo6y2Cc/UnJ6Nbtgiuwg/mVZCp1Fxryjke9o+278k0ze1SZn+SIEgQ6QS8v21gYiBiqRz9tafG8DVS/rjmhMpzxhDc2sYs+h2sZeFETJquybByNk76zEiFuhKPuzzz33dF117wRGhUcnCUi9bqEcMfDfTeN9UurF0ZNFoLwqlgfZfR5FKF8GHcbtdkdAVECLlcepKK2EtkImUA+oQcHBkUahWULupRPE1HWK4RoQsrxnwl7TASKkktiWIYYynQDk5S/yV4POHnpbAB5cNuzsKlej8uAWhNAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUkQuXiO/x19n+Qo2nP0vTSyaWvd0wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wGwYDVR0RBBQwEoIQaWRwLXRlc3Quc3VuaS5zZTANBgkqhkiG9w0BAQsFAAOCAQEAKl0eOcXaD8QEjMgjMJ/VbIFjQcZjGToKD7nEOwwR3qqVkNVtdcLofe6wmZM1ZaWtdRZ+HL6bJpAAn2EWtdAb0m6QNrkHF9dsSeNZUn3M+UZptfUxjDspnH070Crhghdq2Q1KPr3YC1VNBaN7bOJUwAhx1mEork3ZOYMlY8pnPUStDyi2p+LMgEVjDLjAEY+uuZL0fYUbdHuEMQ3c13APY7siDdOa8iGzk1NzxMINC5xpLSlWa+i6VtusuX4QumZVkB0n7Qm6JlU9D/Lp/MhzbvD5hKiy9Ii15XNrEJG4P0HY4GpTemNdx6fP5AeJ6NpahMiVbyTntNQJRpdPz28CDQ==</X509Certificate>
+          <X509Certificate>MIIC4jCCAcqgAwIBAgIQek/EaOs9V7VFR7XG3cPV/TANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLnQfl7WTniCN9Y4WD6FGtQTtfrU7cto9w/1p3lPZynmiYZ2XoVLCIFOjshhnTtUWSdj5ajAXEWkTE0wuLJKIffDblJbUcdxi1V9uOkHoytCRV7sN48hGm5ayu2aT6j6272R0P7iLhaoU5QR/AWsyo4A/UDRirGa/m0pJyyfhSuHqFmkl9f5voLZLvweHrgWj+ie1xkACeeiKnykKqLgBf4LI5z+PMlhMGbLTGsmH5+ljwUmBqiXh2FMG62//gOBDs7wq1iZIm1DV/4b7yKJrTJgStrgo7XVZfj9+BMbc3NRdYgL/WG6E4t6WP2rhtflDY9/xNm1l5nIW7Wd3+S760CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABc10A6vq9oVHSxmqh7+hwpT8l6eRZhiBDmNAGUovbLnXeytV02vZc6IXNEI72Qzhh6g0FiGSucxRTrUyMX9FtjR/vBwk16KSLQn0FNNBxqV8Wet9mE5R+1fPGWzulp8YQtz5J31xchGoMieJ7M+TLV1Od0iQSqa3/9pfVV35ui4kiPXSyFhUtvRAn+fvSi8RYg6DVB4IRUskLOEMlYRq1SH8JfaiCwdbd5IzDA7Pe60qxrPVOyBJRylfR770ubyJAxhIvfU2m2nKOw2jALD98jDjQ7/1Nli9kA7vdf2NsMUgR76qGczGepjF2l4MIpV22RwMVbfnVsaC0mTpHMdQkg==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIEmzCCA4OgAwIBAgIRAPk+SXniS3T2At3wrsquxWEwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNDIwMDAwMDAwWhcNMTgwNDE5MjM1OTU5WjA+MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGTAXBgNVBAMTEGlkcC10ZXN0LnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrrCK7qc2FuRKTeSb4sUoKHR6R/o7WLS7ZHbxmcwhm1Vpmx3ToxSYo+nzo6y2Cc/UnJ6Nbtgiuwg/mVZCp1Fxryjke9o+278k0ze1SZn+SIEgQ6QS8v21gYiBiqRz9tafG8DVS/rjmhMpzxhDc2sYs+h2sZeFETJquybByNk76zEiFuhKPuzzz33dF117wRGhUcnCUi9bqEcMfDfTeN9UurF0ZNFoLwqlgfZfR5FKF8GHcbtdkdAVECLlcepKK2EtkImUA+oQcHBkUahWULupRPE1HWK4RoQsrxnwl7TASKkktiWIYYynQDk5S/yV4POHnpbAB5cNuzsKlej8uAWhNAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUkQuXiO/x19n+Qo2nP0vTSyaWvd0wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wGwYDVR0RBBQwEoIQaWRwLXRlc3Quc3VuaS5zZTANBgkqhkiG9w0BAQsFAAOCAQEAKl0eOcXaD8QEjMgjMJ/VbIFjQcZjGToKD7nEOwwR3qqVkNVtdcLofe6wmZM1ZaWtdRZ+HL6bJpAAn2EWtdAb0m6QNrkHF9dsSeNZUn3M+UZptfUxjDspnH070Crhghdq2Q1KPr3YC1VNBaN7bOJUwAhx1mEork3ZOYMlY8pnPUStDyi2p+LMgEVjDLjAEY+uuZL0fYUbdHuEMQ3c13APY7siDdOa8iGzk1NzxMINC5xpLSlWa+i6VtusuX4QumZVkB0n7Qm6JlU9D/Lp/MhzbvD5hKiy9Ii15XNrEJG4P0HY4GpTemNdx6fP5AeJ6NpahMiVbyTntNQJRpdPz28CDQ==</X509Certificate>
+          <X509Certificate>MIIC3DCCAcSgAwIBAgIQdLObATCTf61N9d9qj8ZV0zANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBpZHAtdGVzdC5zdW5pLnNlMB4XDTE3MDIxNTE1NTM0MFoXDTE4MDIxNTE1NTM0MFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gaWRwLXRlc3Quc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWUL0Drry/FB46wntV1iIOsBg6QqXrvDlCGaJ/O1JhJ2/ZeqACcCKPZySJSQ+0x5R3V9rbbI4an1JM20Bktjf0xmfT2+80QgGjvNi2W5drem+t7SOAvCBa8RvkYkY2lX/wee6bInkAlsAtQZ9o9ffgYVxlOUW+USR+7XT6F9wtTVrZSX2QK4whj9JWdyA/sQLgjeWU8WFN506KZERm3ua1wpV5EoCOnShIamGhfpgaRVNPI9pcyw0gwXeMdDfPYhfBFni1Tn9tLdsYj878P/3irKwkcTtC3VgYnKsI9U6XJzG5w1wfzTJEnSp9HVhF7UaFcEYTgb3sXunGKwz49ABsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQf4xSVepvO2OtF1AokPidv0o1RHYsmJjREfn/bJVV0SQKaYCUx75rPaPUEQTqY3vLdongoJmRaM2hudr5fF+iGRsvIAPoZQcESOZ55k9ff2Ix4yj3CrH93RCbiWDlx80xgjIP5NrsZsrq9YSV6IQCml77qAwYdg7LqeLie1rmgh59PnrIxKO9JoDp8ZYJV1fAaaEpnuqbmUlL51RFNHsyujvc3i991yHCifeDVseOZchZAafmnHHphfsUdlInrohcy4p9nFC8/DdUmipViTAvB6HVvU18lw9dUBU8D4m+RitudnecZdxABWfb4l63j+PhPHDmHS1AuWF0Shs5yrXBQ==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -27,7 +200,6 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.suni.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
@@ -35,83 +207,30 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="socialSecurityNumber"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:mace:dir:attribute-def:norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:mace:dir:attribute-def:vfu" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="vfu"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Display Name"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/initials" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Initials"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="socialSecurityNumberNotOld"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv">Södertörns högskola test</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Södertörns högskola test</OrganizationDisplayName>
+    <OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Södertörns högskola - test</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.sh.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Tomas</GivenName>
     <SurName>Legat</SurName>
-    <EmailAddress>server@sh.se</EmailAddress>
-    <TelephoneNumber>08-6084000</TelephoneNumber>
+    <EmailAddress>tomas.legat@sh.se</EmailAddress>
+    <TelephoneNumber/>
   </ContactPerson>
 </EntityDescriptor>