summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-04-12 08:47:14 +0200
committerLeif Johansson <leifj@sunet.se>2011-04-12 08:47:14 +0200
commit0d404c66e11bfae1916fdf5f2182729afd3f5bb4 (patch)
tree7120ac6a459295bdda1f11ac83f9e65c7a3543b6
parent4bce40c0fed2167429f498006677ea0eee87cd01 (diff)
rolands lingon
-rw-r--r--swamid-1.0.mxml1
-rw-r--r--swamid-1.0/lingon.ladok.umu.se.xml46
2 files changed, 23 insertions, 24 deletions
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index dc8fbb56..fc9609b9 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -166,4 +166,5 @@
<xi:include href="swamid-1.0/shibboleth.vhs.se.xml"/>
<xi:include href="swamid-1.0/www.wisum.its.umu.se.xml"/>
<xi:include href="nya-1.0/www.studera.testa.antagning.se.xml"/>
+ <xi:include href="swamid-1.0/lingon.ladok.umu.se.xml"/>
</EntitiesDescriptor>
diff --git a/swamid-1.0/lingon.ladok.umu.se.xml b/swamid-1.0/lingon.ladok.umu.se.xml
index 41bb7090..4454d070 100644
--- a/swamid-1.0/lingon.ladok.umu.se.xml
+++ b/swamid-1.0/lingon.ladok.umu.se.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntitiesDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
- <ns0:EntityDescriptor entityID="http://lingon.ladok.umu.se:8087/sp.xml">
- <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
- <ns0:KeyDescriptor>
- <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
- <ns1:X509Data>
- <ns1:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
+ <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://lingon.ladok.umu.se:8087/sp.xml">
+ <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV
BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx
EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz
MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l
@@ -21,20 +20,19 @@ AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO
zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
+vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=
-</ns1:X509Certificate>
- </ns1:X509Data>
- </ns1:KeyInfo>
- </ns0:KeyDescriptor>
- <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://lingon.ladok.umu.se:8087/" index="1"/>
- </ns0:SPSSODescriptor>
- <ns0:Organization>
- <ns0:OrganizationName xml:lang="en">The GEMbus registry</ns0:OrganizationName>
- <ns0:OrganizationDisplayName xml:lang="en">The GEMbus registry</ns0:OrganizationDisplayName>
- <ns0:OrganizationURL xml:lang="en">http://lingon.ladok.umu.se:8087/gembus.html</ns0:OrganizationURL>
- </ns0:Organization>
- <ns0:ContactPerson contactType="technical">
- <ns0:GivenName>Roland</ns0:GivenName>
- <ns0:SurName>Hedberg</ns0:SurName>
- </ns0:ContactPerson>
- </ns0:EntityDescriptor>
-</ns0:EntitiesDescriptor>
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://lingon.ladok.umu.se:8087/" index="1"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">The GEMbus registry</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">The GEMbus registry</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://lingon.ladok.umu.se:8087/gembus.html</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Roland</md:GivenName>
+ <md:SurName>Hedberg</md:SurName>
+ </md:ContactPerson>
+ </md:EntityDescriptor>