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/idp.hslu.ch-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml index cc035811..ce484b4b 100644 --- a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hslu.ch/idp/shibboleth"> <md:Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-01-30T12:51:01Z"> + <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-08-06T12:49:00Z"> <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> @@ -94,8 +94,8 @@ IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0 </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/> - <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat> @@ -133,8 +133,8 @@ IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0 </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/> - <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> + <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/AttributeQuery"/> + <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/idp/profile/SAML2/SOAP/AttributeQuery"/> <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat> <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat> |