diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-07-12 22:38:10 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-07-12 22:38:10 +0200 |
| commit | 85f007ad6e351d9d57176ddc65bc6774f03b5425 (patch) | |
| tree | 916c3f862585dd763a561963d24afa7cd6f8d18b /swamid-2.0 | |
| parent | 4255de31e909b0525f5a1f2fe93e1d773d4c651f (diff) | |
| parent | bfebfddc81b16ce887c2894dec5592b522d15996 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Diffstat (limited to 'swamid-2.0')
| -rw-r--r-- | swamid-2.0/aktivera.ki.se-shibboleth.xml | 2 | ||||
| -rw-r--r-- | swamid-2.0/selfservice.hb.se-shibboleth.xml | 2 | ||||
| -rw-r--r-- | swamid-2.0/wiki.edugain.org-shibboleth.xml | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml index 0f4ec206..087626ac 100644 --- a/swamid-2.0/aktivera.ki.se-shibboleth.xml +++ b/swamid-2.0/aktivera.ki.se-shibboleth.xml @@ -14,6 +14,8 @@ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category"> + <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml index 29db4337..16425ab8 100644 --- a/swamid-2.0/selfservice.hb.se-shibboleth.xml +++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml @@ -31,6 +31,8 @@ and do *NOT* provide it in real time to your partners. <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://selfservice.hb.se/Shibboleth.sso/Login" index="2"/> <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category"> + <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/wiki.edugain.org-shibboleth.xml b/swamid-2.0/wiki.edugain.org-shibboleth.xml index 6a56482f..bd359e97 100644 --- a/swamid-2.0/wiki.edugain.org-shibboleth.xml +++ b/swamid-2.0/wiki.edugain.org-shibboleth.xml @@ -36,6 +36,7 @@ nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA== </ds:X509Data> </ds:KeyInfo> </KeyDescriptor> + <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat> <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/POST"/> |