Resolved SWAMID-749

5 files changed, 29 insertions, 28 deletions

diff --git a/swamid-2.0/ra.se-leg.se-shibboleth.xml b/swamid-2.0/ra.se-leg.se-shibboleth.xml
index 606c0459..a9af6272 100644
--- a/swamid-2.0/ra.se-leg.se-shibboleth.xml
+++ b/swamid-2.0/ra.se-leg.se-shibboleth.xml
@@ -26,10 +26,10 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="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://ra.se-leg.se/Shibboleth.sso/Login/eduid-dev"/>
+      <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://ra.se-leg.se/Shibboleth.sso/Login/eduid"/>
       <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://ra.se-leg.se/Shibboleth.sso/Login/sunet-siths"/>
-      <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://ra.se-leg.se/Shibboleth.sso/DS/swamid-test"/>
-      <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://ra.se-leg.se/Shibboleth.sso/DS/swamid-test" 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://ra.se-leg.se/Shibboleth.sso/DS/ndn"/>
+      <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://ra.se-leg.se/Shibboleth.sso/DS/ndn" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -37,29 +37,30 @@
         <ds:KeyName>ra.se-leg.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ra.se-leg.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAKj4PEYDXmGDMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDHJhLnNlLWxlZy5zZTAeFw0xODA0MDYxMTI3MDlaFw0yODA0MDYxMTI3MDla
-MBcxFTATBgNVBAMTDHJhLnNlLWxlZy5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
-ADCCAYoCggGBAPBitjY82g71TZFD2FoQny+nWi47CWCDcfwac8KY2bli6Gbv1274
-by+g+KQPjvlf4rutKH8TCX0vLwW/Z8z3xKa1r9Jjntj91MdkXhj30+SB/NHvDdDX
-hjodh/o52Jq4STgFelXT8rPin9wl59AzixDYSc2FhvP1wgUm8yinl8I8DbYYntuk
-wEMg2jNpIfMD75fgZ/2OiIA07GtT2NYmidePP4Oh+6fnqm8UCdT78CAJq/68AWVn
-Nb4gPj/xVa/B6PNQfBbcMU4HhCbheog88oVuozkeVJGdcjkxDb/m0JajD7vCxg7A
-7vsUQEy73Xz5YkXSnbuvPSLWxw9LM3sNHPMGtiGEjXkTT0ivP8ck8q7yIng08ePL
-I7z4DE7HAQOtegsy83Wj09svOgD9f4Zbqs9hKZCIMZPEJ4plTEBCdOkjsBSFvv+d
-/pbTApQYgndvSQSX4DJhSpIuspBI7Jbbnom6PUfA/qcwz6OC3Ov9IpS5aQGW4A/Z
-nO+4CM+vuuvmtwIDAQABo1swWTA4BgNVHREEMTAvggxyYS5zZS1sZWcuc2WGH2h0
-dHBzOi8vcmEuc2UtbGVnLnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFMjWjw0gad/q
-TG1L3UlhDczozvD9MA0GCSqGSIb3DQEBCwUAA4IBgQCwC0R5ll6/7Sfj4kdsMrfh
-AmAgwcf1IxqkjEPbhI1y5TRMLhB7Ajex1O2dClv/LcUn47gihDDeQPivWZMAOhSi
-VZ5zvPiFDLSq0qQCr71A/tZQSMTg4Soiy2Pdq9DIsxob2DHV23irjvl6HgdMhxXp
-FIoQ2lf9irpBLaNvOrp1js+FM4PrcAL1vMYUzcUSF01wOevaTtzL/qdQ/ISOmnEK
-TQQgR3l0tQ1DQmLQIrp1PIlrc9pqPf4m9UR10EcFr88Tl9eyBrNHmkXBDelmEFTj
-qGwPATq188LAtfp6xExopWG4OZo2ioiJ67ruOErNB4FXmOBI77/Q8ftWKhs+BsXE
-4tk58laYNiye7lEJym+7UeDMdIwGsOhQaQDaQc5HAfdlUaqLCTXEoXGvH/6dEfeH
-Rs8MaY+DpvgNti0cN9bXRD3aFqi5yC4tWiiHVpYts3442WPSNS3aXxPDgPs+aChd
-T19tniO2NrPKbky6hf0eG9p/Z3d05JLLmxujdGeASX4=
-</ds:X509Certificate>
+          <ds:X509Certificate>
+            MIIEDDCCAnSgAwIBAgIJAKj4PEYDXmGDMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+            BAMTDHJhLnNlLWxlZy5zZTAeFw0xODA0MDYxMTI3MDlaFw0yODA0MDYxMTI3MDla
+            MBcxFTATBgNVBAMTDHJhLnNlLWxlZy5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP
+            ADCCAYoCggGBAPBitjY82g71TZFD2FoQny+nWi47CWCDcfwac8KY2bli6Gbv1274
+            by+g+KQPjvlf4rutKH8TCX0vLwW/Z8z3xKa1r9Jjntj91MdkXhj30+SB/NHvDdDX
+            hjodh/o52Jq4STgFelXT8rPin9wl59AzixDYSc2FhvP1wgUm8yinl8I8DbYYntuk
+            wEMg2jNpIfMD75fgZ/2OiIA07GtT2NYmidePP4Oh+6fnqm8UCdT78CAJq/68AWVn
+            Nb4gPj/xVa/B6PNQfBbcMU4HhCbheog88oVuozkeVJGdcjkxDb/m0JajD7vCxg7A
+            7vsUQEy73Xz5YkXSnbuvPSLWxw9LM3sNHPMGtiGEjXkTT0ivP8ck8q7yIng08ePL
+            I7z4DE7HAQOtegsy83Wj09svOgD9f4Zbqs9hKZCIMZPEJ4plTEBCdOkjsBSFvv+d
+            /pbTApQYgndvSQSX4DJhSpIuspBI7Jbbnom6PUfA/qcwz6OC3Ov9IpS5aQGW4A/Z
+            nO+4CM+vuuvmtwIDAQABo1swWTA4BgNVHREEMTAvggxyYS5zZS1sZWcuc2WGH2h0
+            dHBzOi8vcmEuc2UtbGVnLnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFMjWjw0gad/q
+            TG1L3UlhDczozvD9MA0GCSqGSIb3DQEBCwUAA4IBgQCwC0R5ll6/7Sfj4kdsMrfh
+            AmAgwcf1IxqkjEPbhI1y5TRMLhB7Ajex1O2dClv/LcUn47gihDDeQPivWZMAOhSi
+            VZ5zvPiFDLSq0qQCr71A/tZQSMTg4Soiy2Pdq9DIsxob2DHV23irjvl6HgdMhxXp
+            FIoQ2lf9irpBLaNvOrp1js+FM4PrcAL1vMYUzcUSF01wOevaTtzL/qdQ/ISOmnEK
+            TQQgR3l0tQ1DQmLQIrp1PIlrc9pqPf4m9UR10EcFr88Tl9eyBrNHmkXBDelmEFTj
+            qGwPATq188LAtfp6xExopWG4OZo2ioiJ67ruOErNB4FXmOBI77/Q8ftWKhs+BsXE
+            4tk58laYNiye7lEJym+7UeDMdIwGsOhQaQDaQc5HAfdlUaqLCTXEoXGvH/6dEfeH
+            Rs8MaY+DpvgNti0cN9bXRD3aFqi5yC4tWiiHVpYts3442WPSNS3aXxPDgPs+aChd
+            T19tniO2NrPKbky6hf0eG9p/Z3d05JLLmxujdGeASX4=
+          </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index ccc9add9..2726b1ac 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -12,4 +12,5 @@
   <xi:include href="swamid-2.0/adfs2.gu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
+  <xi:include href="swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 5ae09a3b..674c937d 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -713,4 +713,5 @@
   <xi:include href="swamid-2.0/kauplay.kau.se.xml"/>
   <xi:include href="swamid-2.0/play.ju.se.xml"/>
   <xi:include href="swamid-2.0/indico.test.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/ra.se-leg.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 1b06bdec..7c9c14a1 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -55,7 +55,6 @@
   <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/login1.fhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp.dev.eduid.se-idp.xml.xml"/>
   <xi:include href="swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 0ddef7fe..d3a9091c 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -46,5 +46,4 @@
   <xi:include href="swamid-2.0/sp.haikom.com-saml-kph-test.xml"/>
   <xi:include href="swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml"/>
   <xi:include href="swamid-2.0/uppsala-test.blackboard.com-lms.xml"/>
-  <xi:include href="swamid-2.0/ra.se-leg.se-shibboleth.xml"/>
 </EntitiesDescriptor>