1 files changed, 13 insertions, 71 deletions
diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index ec19d0a6..928a1ee4 100644
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -47,30 +47,6 @@
         <mdui:IPHint>2001:6b0:27::/48</mdui:IPHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIVAKNIMRVddJl8Eq2nzLvhFamfj39qMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
-MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
-cmYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa/mHPOa5/M9Ur
-INayTyL9eTIYmYet2QHaVICODn20KBzRBIVrm0n33Z3N6bZ2qqi4yJ48qQsJnJWi
-951yN0CUXVEGWgJIb0ERQrnKHw63d/JBqmp1ImYBWom97Upzdiy0eXwkASzD3ztl
-6ri3+SqZmltEXc9bIEavVcFUTPqU68aP8AtoiRzTxjGfwWBcsDri+ZkN76t1mt/Y
-epWvt/EPEX6Xp1/1qAiyZO6ja8zcksfKn70u6fPgCYHXxqJ0pEwRwReT8PbuQmyl
-vHhncs/EXqTiNlfcpK67ydigQ84Cp1f1qf8snYZPuIUfUbuFrTUnoKjGP1qiaxJo
-l/qaSqz5AgMBAAGjbzBtMB0GA1UdDgQWBBSYP4tgO7b03F98vWe6ZEbQkqbzETBM
-BgNVHREERTBDghRpZHBzaGliYm9sZXRoLmlyZi5zZYYraHR0cHM6Ly9pZHBzaGli
-Ym9sZXRoLmlyZi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-b0dwwUW0J0ZTdbZeehpoOQGB71sc3ZwdBxkmlFqr+xJqjT/shX3yNYrpmuhcVjog
-i4hnWitIE79kJ9FXEvgSnJORuIvaKzlheno7fa5x3mU3TnnHrPdc5nLSXNhFnezk
-4kqvIK5GL0bJQGuf6BKU/Ot8GFYPTKAi1D2aRaI3xzc7cj/EpCpFiEKWUbBFOHN8
-FYtcAWcGkYZsHioAMaaKNuVnk2srKT4lNrIVMFn+8mzri18rIs7GPrUi2tK2LoX0
-CkZfFUJynwfG4GDixCdVykAiT+DJAZ0AUOGAD0ASgp0fcYp4q54WqFngl3IvCr2T
-0Kcn98Fuw5/qCHZ1mIAgyA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -108,53 +84,6 @@ v5Pr0LqV2VHifS0hTRd84qZ+/sao0y5X/TAc3FW6BORpEsOCblOPGHW+CoHicDX+
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIUa5oeenhHPCRZR3Fo7OoalJEOoOQwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5pcmYuc2UwHhcNMjIxMTA5MDcz
-ODUzWhcNMzIxMTA5MDczODUzWjAfMR0wGwYDVQQDDBRpZHBzaGliYm9sZXRoLmly
-Zi5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJIs7p9r9wAFzuSH
-ZOWFbAwdlmgfQwG2GrbUxvGatziB5sUe1ZlRA+n2OTpM3JCGGPbNYn70T3COUrOd
-/R+c+5sIEWWAiuohKbjZ6Nhhap9pB4EFtJjTd93lYTpX8VHSuncBVxkw+cfKmq51
-HOU++1jgDoRX3LtwqgsisDQqI1KwzAcrapf3VNP62CKxdeGTz7wt8WbZ0vDJygr8
-cRC3c2mWkIg62Lrf1oocIo5j7zRLRZxO3Zjfp+A/UuYUAkXT+dpP4qcaQDOl260m
-UqUjnJKLc56l+flmqJdF0QaO1pHSb7UBXD4/alr3XjXgK4IVlm1lTolyZEJiSP6N
-pXhS2G22fWLN+C9A6pUCHqyguZ3EyRLirKaT5K6BKnsxesK1aPZ3ounyE0pTYLMq
-808iMer2aI91NM6WtaPCtx7+WRbu7QXSndkemm+b3U8WN0O7zfLWMC7NiDZQPG1M
-tl5NiBoMkm/B5TyOo1jf5U4+DvdvhVfEFwwl5wshfvCdZuU/zYhvvsYWb/jyjtbi
-yb3cESqUx3vtGb8TLc21vlqtB9j9XGOGTiqj4nXuoWnIC1GVPIxNu3X/iA2PYxhd
-wBLddd0yT+Rz5YzJ/mTNy6SRra3sgflXLn+49XJNl0VlDfFJ+wLxtQ9qaRisK92Z
-5p/pMQt0TBygS1gMHmiHr21sm3BbAgMBAAGjQjBAMB0GA1UdDgQWBBT6te8GTOwS
-mAteAp7vAsRwB+u+HjAfBgNVHREEGDAWghRpZHBzaGliYm9sZXRoLmlyZi5zZTAN
-BgkqhkiG9w0BAQsFAAOCAgEADoDP/NWcLu5LpuUzTZToqkztCKrkKCe1e/NtEHU8
-dPucGah1DIPqnYUVwhieP7Brb7CPhZz7CqbCtwtgc/KbZJXKpOf5S5ofpBXiYGnB
-V+oE2U21xglzw61EYgS1EwaeceSaYfTMbX6y9cjCTBQTAkJ1ZJA2+zJBMRFYfy2G
-U7tZDL04dTSRpHUvZHRuT2a+9IM8GHc2R3mURcZvrwShDyKhG45EVHJdZIXWtQDH
-l2fAV9Yv9ykG35PzGX8L8q6D9dxL+BVm1D0PQZkUEmA8EukgLXnsvlmxyhY6r/v3
-GHsI0ftRrjLjvySWMW+NkCRW3FoCqJHpIuchBuZbvLM07sBcdKnNBVvSFDRdjJIr
-/NTbacmthEefcLGodjmxmxq0MiJfWIIhp2KbBi/odsb4K2A7rAia3SEOkY/nC+NJ
-EJ+mVx5hqhzIqMmFr603utXYUGAVC/foX3KxhoDIA5o3hcOrK0vpmi+mekhelyFI
-1/1rWrwyImaQdexW320APGDrPSVrXCEyjMsOSfQ/scHpsyvN8xJXaOR8iJHA8KAC
-AACVD198JjSnWA25HwZ8PlYt4tm80EJmarJ5YcsWBVlwV1SRdqekjTb2o8NBIuZL
-v5Pr0LqV2VHifS0hTRd84qZ+/sao0y5X/TAc3FW6BORpEsOCblOPGHW+CoHicDX+
-+wk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshibboleth.irf.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIFDzCCAvegAwIBAgIVAPtjDi+3iZ+3i2UvPXVpNzFUAn/3MA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTIyMTEwOTA3
 MzkxMloXDTMyMTEwOTA3MzkxMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
@@ -186,6 +115,19 @@ nnmgcuLeWY0JKSObDThQxmQM+PHnszKEdo9hDZTGcQc49C8dSN7Wup5pFzSm2i0t
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshibboleth.irf.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+    </md:Extensions>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>