diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
| commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
| tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/login.justis.com.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/login.justis.com.xml')
| -rw-r--r-- | swamid-interfederations-2.0/login.justis.com.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/swamid-interfederations-2.0/login.justis.com.xml b/swamid-interfederations-2.0/login.justis.com.xml index 0b73196d..48ab6177 100644 --- a/swamid-interfederations-2.0/login.justis.com.xml +++ b/swamid-interfederations-2.0/login.justis.com.xml @@ -6,8 +6,8 @@ <Extensions> <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/> </Extensions> - <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol"> - <KeyDescriptor use="signing"> + <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> + <KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> <ds:X509Certificate> @@ -37,9 +37,12 @@ </ds:X509Data> </ds:KeyInfo> </KeyDescriptor> - <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.justis.com/shibboleth/post" index="1"/> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/shibboleth/artifact" index="2"/> + <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signin.justis.com/oa/auth/rcv/shib/post" index="3"/> + <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signin.justis.com/oa/auth/rcv/shib/art" index="4"/> + <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.justis.com/oa/auth/rcv/saml2/post" index="5"/> + <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://signin.justis.com/oa/auth/rcv/saml2/art" index="6"/> </SPSSODescriptor> <Organization> <OrganizationName xml:lang="en">Justis Publishing Limited</OrganizationName> |