summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-2.0/saml.salesforce.com-sunet-sandbox.xml (renamed from swamid-2.0/saml.salesforce.com-ndn.xml)38
-rw-r--r--swamid-sp-2.0.mxml2
2 files changed, 5 insertions, 35 deletions
diff --git a/swamid-2.0/saml.salesforce.com-ndn.xml b/swamid-2.0/saml.salesforce.com-sunet-sandbox.xml
index 41384166..3473a5dc 100644
--- a/swamid-2.0/saml.salesforce.com-ndn.xml
+++ b/swamid-2.0/saml.salesforce.com-sunet-sandbox.xml
@@ -1,5 +1,5 @@
<?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: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>
@@ -33,41 +33,11 @@ U0N7YIKNKZq5hcoUP/sCpcReMNj0dAWeVYmADrV7LlOVvndgHKcLrUydS/9obQHen</ds:X509Certif
</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: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">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: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 8903998a..28ae4b1d 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,6 +459,7 @@
<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"/>
<xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
<xi:include href="swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml"/>
</md:EntitiesDescriptor>