1 files changed, 3 insertions, 50 deletions
diff --git a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml b/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
index 962bc87a..60f3bccf 100644
--- a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
+++ b/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
@@ -28,11 +28,10 @@
       </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:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol 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://administrationsverktyg.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
       <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://administrationsverktyg.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <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://administrationsverktyg.umu.se/Shibboleth.sso/IDP"/>
       <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://administrationsverktyg.umu.se/Shibboleth.sso/Loginx"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Produktionssystem för administration av användarkonton vid Umeå universitet</mdui:DisplayName>
@@ -40,55 +39,13 @@
         <mdui:Description xml:lang="sv">Administration av användarkonton</mdui:Description>
         <mdui:Description xml:lang="en">Administration of user accounts</mdui:Description>
       </mdui:UIInfo>
+      <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://administrationsverktyg.umu.se/Shibboleth.sso/adfs"/>
+      <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://administrationsverktyg.umu.se/Shibboleth.sso/eduid"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:KeyName>administrationsverktyg.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=administrationsverktyg.umu.se,OU=its,O=umea university,L=umea,ST=umea,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAKyNek9su3+oMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
-VQQGEwJTRTENMAsGA1UECBMEdW1lYTENMAsGA1UEBxMEdW1lYTEYMBYGA1UEChMP
-dW1lYSB1bml2ZXJzaXR5MQwwCgYDVQQLEwNpdHMxJjAkBgNVBAMTHWFkbWluaXN0
-cmF0aW9uc3Zlcmt0eWcudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0b21teS5sYXJz
-c29uQHVtdS5zZTAeFw0xNzExMjcwOTMzMzBaFw0yMDEwMTAwOTMzMzBaMIGgMQsw
-CQYDVQQGEwJTRTENMAsGA1UECBMEdW1lYTENMAsGA1UEBxMEdW1lYTEYMBYGA1UE
-ChMPdW1lYSB1bml2ZXJzaXR5MQwwCgYDVQQLEwNpdHMxJjAkBgNVBAMTHWFkbWlu
-aXN0cmF0aW9uc3Zlcmt0eWcudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0b21teS5s
-YXJzc29uQHVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMad
-jwEzc4bGEfN8g5Rnr85cuc/F//wPLti7BYFKEnpnduSe2LggIDUFuhnRsD4ZZTPf
-5pq3cnlnj7q7UoDRzQR24aE3lz6aYqzyksuzeZP3wuvj4WyXJacKbPjmBInmV2Kn
-pJJZ2J3HMr2sNe3imJG5zq5ZpTyz6AZ9eQUVCcRexI7vkKCyg/tsLpYsB1iPHdyn
-xATEboYtFq7QDZtwt+N1qtvdXmlJu2l5MZqLSs8oZZVjcoI2REZ7mxEeukxKdv6g
-3g0+O+TNiIyphGXAqkkep/MOTko2B4AZJeipm/O2la6Tqn8x6cDnbdVyNenhb4Hv
-7kyG6VOayIvHZ0IHpkUCAwEAAaOCAQkwggEFMB0GA1UdDgQWBBScOzkRNnXdbBT+
-HgT13fkTVhcnMzCB1QYDVR0jBIHNMIHKgBScOzkRNnXdbBT+HgT13fkTVhcnM6GB
-pqSBozCBoDELMAkGA1UEBhMCU0UxDTALBgNVBAgTBHVtZWExDTALBgNVBAcTBHVt
-ZWExGDAWBgNVBAoTD3VtZWEgdW5pdmVyc2l0eTEMMAoGA1UECxMDaXRzMSYwJAYD
-VQQDEx1hZG1pbmlzdHJhdGlvbnN2ZXJrdHlnLnVtdS5zZTEjMCEGCSqGSIb3DQEJ
-ARYUdG9tbXkubGFyc3NvbkB1bXUuc2WCCQCsjXpPbLt/qDAMBgNVHRMEBTADAQH/
-MA0GCSqGSIb3DQEBCwUAA4IBAQCqkm9+NfZgur5n0B5R7JmNE5yZFT6ybTuhcSQI
-SzypBBHGK5g0C0xCKpb+v5qo/dS+LySVwi9G0Pp8uF1Bwor97g2wfnYjXFw1zgO1
-np5wsjsJjNcgaTjSWnihLXWSTUz90yMlbRMY4TIrFxDZUgXZP1MHxfgf+BqH2f5b
-hMVy+ILnwh69da4fmqSFeR6a6+dYZc/WVpbU8KwNuIsmqkZij4YarwDS1yXRdEMh
-3yksOhZc5Ik1PScjSMOiToS9mLoAjGjgHLGQQJiOVk2UB66wh1aOXQqTSWKBI/Ji
-0pQVe0DybRYV1L9nizdvjm6FyqlV/k/Ay4rSiPEEQbfzxSLb
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>administrationsverktyg.umu.se</ds:KeyName>
-        <ds:X509Data>
           <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=administrationsverktyg.umu.se,OU=ITS,O=ITS,L=Umea,ST=vasterbotten,C=SE</ds:X509SubjectName>
           <ds:X509Certificate>MIIEEDCCAvigAwIBAgIJAJ5qWBv+yDyJMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
 VQQGEwJTRTEVMBMGA1UECAwMdmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
@@ -130,10 +87,6 @@ rnr4gDQ+JdRcPUyn4+9DPcsnABhy+LtA3mmXyFBJ2jetFqPJ
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/NIM/SOAP"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SAML/POST" index="7"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>