diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
| commit | b217869b73c7ceb7653972740e0f796cf9bbd383 (patch) | |
| tree | ca10c13dc56d3c1665f5e89759e91ede7489bffc /swamid-1.0/shibboleth.slu.se.xml | |
| parent | 5b14805f2ecc3b89ea0ff9b08a8714a3b895347e (diff) | |
| parent | c5391135cbba3c20214e9e44c433925931df1453 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0/shib-idp-1.oru.se.xml
Diffstat (limited to 'swamid-1.0/shibboleth.slu.se.xml')
| -rw-r--r-- | swamid-1.0/shibboleth.slu.se.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/swamid-1.0/shibboleth.slu.se.xml b/swamid-1.0/shibboleth.slu.se.xml index 5ea5d5b4..b9aea074 100644 --- a/swamid-1.0/shibboleth.slu.se.xml +++ b/swamid-1.0/shibboleth.slu.se.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.slu.se/idp/shibboleth"> - <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> + <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <Extensions> <shibmd:Scope regexp="false">slu.se</shibmd:Scope> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName> @@ -46,7 +45,7 @@ xpmbgA==</ds:X509Certificate> <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/> <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.slu.se/idp/profile/SAML2/Redirect/SSO"/> </IDPSSODescriptor> - <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> + <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <Extensions> <shibmd:Scope regexp="false">slu.se</shibmd:Scope> </Extensions> @@ -95,5 +94,4 @@ xpmbgA==</ds:X509Certificate> <SurName>Edholm</SurName> <EmailAddress>stefan.edholm@slu.se</EmailAddress> </ContactPerson> - </EntityDescriptor> |