Resolved SWAMID-795

1 files changed, 0 insertions, 288 deletions

diff --git a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
index 4cb077b4..c6c643f9 100644
--- a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
@@ -1,272 +1,5 @@
 <?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="http://flax.nettst.chalmers.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="flax.nettst.chalmers.se">
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC8jCCAdqgAwIBAgIQEgxsWVI5MItMDSw3vtRQPzANBgkqhkiG9w0BAQUFADAiMSAwHgYDVQQDExdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0xMzAxMTUwODMwMjdaFw0xNDAxMTUwMDAwMDBaMCIxIDAeBgNVBAMTF2ZsYXgubmV0dHN0LmNoYWxtZXJzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzBoO28F8VHPDFxcpDb/936530RM//0xFM/bfxC5AIZn7btoteg0OX7Z4p0FPFlbu/Nb+BRZSElKfp5VIRnZUHORIwtkKWfJU/do1hs80aNXnXzlqCIvIHkB9yuyOEqRAJ3OaccSrr6zi2YoSBEhUeFEbGHo6ItCol+kKZvtofW7IPvmlEm8DZNt/Rs8jbORJuLZ3CMOJsJnLEzQ+tDfj8cf+6dHffMh8kPJWINwMEDa2fWl461ft9AD3MSyzELKmmCY4NFnlDWFZQ4FRz91YAAStHQGdbprCVJ3GS/FOVfLwXn7rbJ9KQZBOpTnQ6FwKrk73fJvrbFsP/uC0wj/LSQIDAQABoyQwIjALBgNVHQ8EBAMCBDAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEFBQADggEBAEhg3NsqmIK1VBJezXFi1hrLt9oz011OzDBblbnAjnUkskwkFcIN8n9RSAYlxBm9FJ61zWhWrVxVGMIlNIVO95JqsfY4AGcpmP2295aPIYgh0B9N+jZGotCEUKtAuYxZZxZtk63Zd1KG2FVRHIolKg9beewBMOZ7U/112GaATyrCdKoz1Isd2LycSi5HjI0s5Qil7CkIVmvYOOZeatNSdhvJl4Hn2CxP2vczjZQn+zWmVaAt5fqsj5QDv8AKCi6oLJXGdxhxn7mJEE9St4yz3uEove+graDBwnkh+O4lrEPceE0yWd7sXIbheQOjEIRLbmEs4/6jYN6VUoXyScMi9bI=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <fed:ClaimTypesRequested>
-      <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/EmailAddress" Optional="true">
-        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</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/claims/UPN" Optional="true">
-        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</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/role" Optional="true">
-        <auth:DisplayName>Role</auth:DisplayName>
-        <auth:Description>A role that the user has</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.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-        <auth:DisplayName>Name ID</auth:DisplayName>
-        <auth:Description>The SAML name 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.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-        <auth:DisplayName>Deny only group SID</auth:DisplayName>
-        <auth:Description>The deny-only 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/denyonlyprimarysid" Optional="true">
-        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-        <auth:Description>The deny-only 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/denyonlyprimarygroupsid" Optional="true">
-        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-        <auth:Description>The deny-only primary 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/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/primarygroupsid" Optional="true">
-        <auth:DisplayName>Primary group SID</auth:DisplayName>
-        <auth:Description>The primary 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 &lt;domain&gt;\&lt;user&gt;</auth:Description>
-      </auth:ClaimType>
-    </fed:ClaimTypesRequested>
-    <fed:TargetScopes>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://flax.nettst.chalmers.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://flax.nettst.chalmers.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://flax.nettst.chalmers.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://flax.nettst.chalmers.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://flax.nettst.chalmers.se/adfs/ls/</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>http://flax.nettst.chalmers.se/adfs/services/trust</Address>
-      </EndpointReference>
-    </fed:TargetScopes>
-    <fed:ApplicationServiceEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://flax.nettst.chalmers.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-    </fed:ApplicationServiceEndpoint>
-    <fed:PassiveRequestorEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://flax.nettst.chalmers.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="flax.nettst.chalmers.se">
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</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/EmailAddress" Optional="true">
-        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</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/claims/UPN" Optional="true">
-        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</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/role" Optional="true">
-        <auth:DisplayName>Role</auth:DisplayName>
-        <auth:Description>A role that the user has</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.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-        <auth:DisplayName>Name ID</auth:DisplayName>
-        <auth:Description>The SAML name 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.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-        <auth:DisplayName>Deny only group SID</auth:DisplayName>
-        <auth:Description>The deny-only 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/denyonlyprimarysid" Optional="true">
-        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-        <auth:Description>The deny-only 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/denyonlyprimarygroupsid" Optional="true">
-        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-        <auth:Description>The deny-only primary 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/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/primarygroupsid" Optional="true">
-        <auth:DisplayName>Primary group SID</auth:DisplayName>
-        <auth:Description>The primary 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 &lt;domain&gt;\&lt;user&gt;</auth:Description>
-      </auth:ClaimType>
-    </fed:ClaimTypesOffered>
-    <fed:SecurityTokenServiceEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://flax.nettst.chalmers.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://flax.nettst.chalmers.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://flax.nettst.chalmers.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>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.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://flax.nettst.chalmers.se/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://flax.nettst.chalmers.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/" index="2"/>
-  </SPSSODescriptor>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">nettst.chalmers.se</shibmd:Scope>
@@ -293,27 +26,6 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.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"/>
-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
-    <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"/>
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">CHALMERSTest</OrganizationName>