From 5cbd9d809b23997a8506a586870da14adf2aafcb Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Thu, 11 Jul 2013 14:38:42 +0200
Subject: RE+HEI added to SFS-tagged services

---
 swamid-2.0/aktivera.ki.se-shibboleth.xml    | 2 ++
 swamid-2.0/selfservice.hb.se-shibboleth.xml | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'swamid-2.0')

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>
-- 
cgit v1.2.3


From bfebfddc81b16ce887c2894dec5592b522d15996 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Thu, 11 Jul 2013 16:26:02 +0200
Subject: SAML1 NameIDFormat added for wiki.edugain.org SWAMIDOPS-6964

---
 swamid-2.0/wiki.edugain.org-shibboleth.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'swamid-2.0')

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"/>
-- 
cgit v1.2.3