From f22a46dbdbe179f7d8877d2951b12f9d6f934ad7 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 28 Sep 2015 14:22:53 +0200
Subject: respin sunet sf sandbox

---
 swamid-2.0/saml.salesforce.com-ndn.xml           | 73 ------------------------
 swamid-2.0/saml.salesforce.com-sunet-sandbox.xml | 42 ++++++++++++++
 swamid-sp-2.0.mxml                               |  2 +-
 3 files changed, 43 insertions(+), 74 deletions(-)
 delete mode 100644 swamid-2.0/saml.salesforce.com-ndn.xml
 create mode 100644 swamid-2.0/saml.salesforce.com-sunet-sandbox.xml

diff --git a/swamid-2.0/saml.salesforce.com-ndn.xml b/swamid-2.0/saml.salesforce.com-ndn.xml
deleted file mode 100644
index 41384166..00000000
--- a/swamid-2.0/saml.salesforce.com-ndn.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://saml.salesforce.com/ndn">
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIQQ4KxN7E3aAGP1rpwQm6gZzANBgkqhkiG9w0BAQUFADCBvDELMAk
-GA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbi
-BUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cud
-mVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMtVmVyaVNpZ24gQ2xhc3MgMyBJbnRl
-cm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4XDTEzMTAxODAwMDAwMFoXDTE3MTAxNzIzNTk
-1OVowgY8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHFA1TYW
-4gRnJhbmNpc2NvMR0wGwYDVQQKFBRTYWxlc2ZvcmNlLmNvbSwgSW5jLjEVMBMGA1UECxQMQ
-XBwbGljYXRpb25zMR0wGwYDVQQDFBRwcm94eS5zYWxlc2ZvcmNlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALJtS/8tJmPZ/CKOz/dJ7MXrgz0MPQKxEAdgrdOFdRj
-savTY+RviREe+zwjrKd9ZsCS3GltV2GBFD+YxXzuptQr+ZUDC8Vwx+49WQ13D55nmoUJVcB
-1nHlTXBICJQDo87cZ4AIViuSVkUfQRG7BeMfKTMngyGdAOIsnSFwp1ONmRqaIarWTfr2w0S
-NFNPikW9rQjehAF/eh6Ib4H3bJEE/kAwRS4mFJoxEKsiJQhnymqeoVgLMSb3UTS8J9R1RmQ
-i+kisC39NAzVwQjM1X677cdQt0FaF6GlZ97vCH/rpNAJnAVwaWiRNQ32AR2X39rp8DVpSk9
-eynNGp1JI/6mIv3ECAwEAAaOCAYcwggGDMB8GA1UdEQQYMBaCFHByb3h5LnNhbGVzZm9yY2
-UuY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCgGA1UdJQQhMB8GCCsGAQUFBwMBB
-ggrBgEFBQcDAgYJYIZIAYb4QgQBMEMGA1UdIAQ8MDowOAYKYIZIAYb4RQEHNjAqMCgGCCsG
-AQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vY3BzMB8GA1UdIwQYMBaAFNebfNg
-ioBX33a1fzimbWMO8RgC1MEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9TVlJJbnRsLUczLW
-NybC52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNybDByBggrBgEFBQcBAQRmMGQwJAYIKwYBB
-QUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTA8BggrBgEFBQcwAoYwaHR0cDovL1NW
-UkludGwtRzMtYWlhLnZlcmlzaWduLmNvbS9TVlJJbnRsRzMuY2VyMA0GCSqGSIb3DQEBBQU
-AA4IBAQAEMsL4HAd5uYW3j0SQFX4Opl7p0Vo4o7HKBHCtV4ZjzkSFwvRR9+5zijYqlhe4ou
-1SL4WAWAsTKMTpKz0CL1S9Npt0IcKmIWeRsjJKKznFa8sxHhgEvm3O11a9uVfgvmnwn0VEp
-uTmGvXvIUSAZ5q0CVDgzbGsrjWnZXllgO6krwPonEg6MdFarA87bAkLCrLZ0HqWeUVlf2nt
-fvR7kjr0trUM/EBxPdcPxeMK70EJqku7GMEPOxkexTr2O0yD/2lZM0il+AUuOboZDl0Syfj
-U0N7YIKNKZq5hcoUP/sCpcReMNj0dAWeVYmADrV7LlOVvndgHKcLrUydS/9obQHen</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEVTCCAz2gAwIBAgIOAU9SUXkjAAAAAD/EWOQwDQYJKoZIhvcNAQELBQAwdTEN
-MAsGA1UEAwwEc2FtbDEYMBYGA1UECwwPMDBEMjUwMDAwMDBDemp0MRcwFQYDVQQK
-DA5TYWxlc2ZvcmNlLmNvbTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzELMAkGA1UE
-CAwCQ0ExDDAKBgNVBAYTA1VTQTAeFw0xNTA4MjEyMjExNTVaFw0xNzA4MjExMjAw
-MDBaMHUxDTALBgNVBAMMBHNhbWwxGDAWBgNVBAsMDzAwRDI1MDAwMDAwQ3pqdDEX
-MBUGA1UECgwOU2FsZXNmb3JjZS5jb20xFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28x
-CzAJBgNVBAgMAkNBMQwwCgYDVQQGEwNVU0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCsTqv7mppF+Lnb7MiPkxmp7mSuAqSoZeXOewng8ePUodeEK0oq
-eb1HbtPS5vHdexvg7AohD9//FULPNa9oa+GiU/pvJUm1pHdIjKK4UK4QwJCODDnS
-HnOD9Ie/eBLPagdPfFAXyd8GbR0JJgkvn8tCIW+UDODuOgC5oTgJrENupo5YUZhW
-j/O6xMkN2f6TxfxCyEX7ziOyU9jjo09r4wJXf6TvdoHbMkRvo3AWNt6zI6vqFwKE
-LH51p8JZXlKqVAZ0hqHtuu1H9GmYFGPld5qrIT2RFnivcISzQy2NU7iikysNJE+k
-loD7CoUXPv5x4OzjUCoeYINUlaQk9B6NkvwfAgMBAAGjgeIwgd8wHQYDVR0OBBYE
-FJvV9op7M9B6CEKfV8MJJZ5g306eMA8GA1UdEwEB/wQFMAMBAf8wgawGA1UdIwSB
-pDCBoYAUm9X2insz0HoIQp9XwwklnmDfTp6heaR3MHUxDTALBgNVBAMMBHNhbWwx
-GDAWBgNVBAsMDzAwRDI1MDAwMDAwQ3pqdDEXMBUGA1UECgwOU2FsZXNmb3JjZS5j
-b20xFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xCzAJBgNVBAgMAkNBMQwwCgYDVQQG
-EwNVU0GCDgFPUlF5IwAAAAA/xFjkMA0GCSqGSIb3DQEBCwUAA4IBAQA5JG2/ubvL
-5QNsDFW2NmrxozJyHLVav2NllnQBktrKbKm20tciN4H93+79dhQuuLfPeGQVwlk6
-ijumvdqItpJnGgKlrezwlHRxoKSSh7NLYXXXWfuFxeThXPjNWDXrBrlBBSO6dJ0Y
-nhJSmNKFhp50k32jCzrIW2+MH0cg9jzyicrTHT76zqltsdUwA4WvBIRvpcjM2oLz
-zcvMMMPDhPxLutsEknKYbjKD+y6m2eMHVEn6csRwfZIv3r70E6/ZMoqv6bIy/VMu
-dPCwrqMPuL1eUiKVqP7OVBBav2+lfoBPjbTckwokk7QgDMvsasrCFB4oHJha2oUy
-D6aIo9S0cqgN</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunet--Test.cs80.my.salesforce.com?so=00D25000000Czjt&amp;sc=0LE250000004CBO" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">Salesforce.com</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/saml.salesforce.com-sunet-sandbox.xml b/swamid-2.0/saml.salesforce.com-sunet-sandbox.xml
new file mode 100644
index 00000000..e8eb29fe
--- /dev/null
+++ b/swamid-2.0/saml.salesforce.com-sunet-sandbox.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?><md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://saml.salesforce.com/sunet-sandbox">
+   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:KeyDescriptor use="signing">
+         <ds:KeyInfo>
+            <ds:X509Data>
+               <ds:X509Certificate>MIIFYDCCBEigAwIBAgIQQ4KxN7E3aAGP1rpwQm6gZzANBgkqhkiG9w0BAQUFADCBvDELMAk
+GA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbi
+BUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cud
+mVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMtVmVyaVNpZ24gQ2xhc3MgMyBJbnRl
+cm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4XDTEzMTAxODAwMDAwMFoXDTE3MTAxNzIzNTk
+1OVowgY8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHFA1TYW
+4gRnJhbmNpc2NvMR0wGwYDVQQKFBRTYWxlc2ZvcmNlLmNvbSwgSW5jLjEVMBMGA1UECxQMQ
+XBwbGljYXRpb25zMR0wGwYDVQQDFBRwcm94eS5zYWxlc2ZvcmNlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALJtS/8tJmPZ/CKOz/dJ7MXrgz0MPQKxEAdgrdOFdRj
+savTY+RviREe+zwjrKd9ZsCS3GltV2GBFD+YxXzuptQr+ZUDC8Vwx+49WQ13D55nmoUJVcB
+1nHlTXBICJQDo87cZ4AIViuSVkUfQRG7BeMfKTMngyGdAOIsnSFwp1ONmRqaIarWTfr2w0S
+NFNPikW9rQjehAF/eh6Ib4H3bJEE/kAwRS4mFJoxEKsiJQhnymqeoVgLMSb3UTS8J9R1RmQ
+i+kisC39NAzVwQjM1X677cdQt0FaF6GlZ97vCH/rpNAJnAVwaWiRNQ32AR2X39rp8DVpSk9
+eynNGp1JI/6mIv3ECAwEAAaOCAYcwggGDMB8GA1UdEQQYMBaCFHByb3h5LnNhbGVzZm9yY2
+UuY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCgGA1UdJQQhMB8GCCsGAQUFBwMBB
+ggrBgEFBQcDAgYJYIZIAYb4QgQBMEMGA1UdIAQ8MDowOAYKYIZIAYb4RQEHNjAqMCgGCCsG
+AQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vY3BzMB8GA1UdIwQYMBaAFNebfNg
+ioBX33a1fzimbWMO8RgC1MEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9TVlJJbnRsLUczLW
+NybC52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNybDByBggrBgEFBQcBAQRmMGQwJAYIKwYBB
+QUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTA8BggrBgEFBQcwAoYwaHR0cDovL1NW
+UkludGwtRzMtYWlhLnZlcmlzaWduLmNvbS9TVlJJbnRsRzMuY2VyMA0GCSqGSIb3DQEBBQU
+AA4IBAQAEMsL4HAd5uYW3j0SQFX4Opl7p0Vo4o7HKBHCtV4ZjzkSFwvRR9+5zijYqlhe4ou
+1SL4WAWAsTKMTpKz0CL1S9Npt0IcKmIWeRsjJKKznFa8sxHhgEvm3O11a9uVfgvmnwn0VEp
+uTmGvXvIUSAZ5q0CVDgzbGsrjWnZXllgO6krwPonEg6MdFarA87bAkLCrLZ0HqWeUVlf2nt
+fvR7kjr0trUM/EBxPdcPxeMK70EJqku7GMEPOxkexTr2O0yD/2lZM0il+AUuOboZDl0Syfj
+U0N7YIKNKZq5hcoUP/sCpcReMNj0dAWeVYmADrV7LlOVvndgHKcLrUydS/9obQHen</ds:X509Certificate>
+            </ds:X509Data>
+         </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunet--Test.cs80.my.salesforce.com?so=00D25000000Czjt" index="0" isDefault="true"/>
+      <md:AttributeConsumingService index="0" isDefault="true">
+         <md:ServiceName xml:lang="en">SUNET Salesforce.com (sandbox)</md:ServiceName>
+         <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      </md:AttributeConsumingService>
+   </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7e9f7c14..7703e66c 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -448,7 +448,6 @@
   <xi:include href="swamid-2.0/7t.lbic.lu.se.xml"/>
   <xi:include href="swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/nyainloggning.hv.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/saml.salesforce.com-ndn.xml"/>
   <xi:include href="swamid-2.0/atlas.slu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml"/>
@@ -460,4 +459,5 @@
   <xi:include href="swamid-2.0/internt.geol.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/play.hkr.se.xml"/>
+  <xi:include href="swamid-2.0/saml.salesforce.com-sunet-sandbox.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3