Addes some more checks in Makefile. And fixed probles found by those checks.

5 files changed, 10 insertions, 20 deletions

diff --git a/swamid-2.0/lingon.ladok.umu.se-8087-re_nren_hei-sp.xml b/swamid-2.0/lingon.ladok.umu.se-8087-re_nren_hei-sp.xml
index af8c34a3..3517a623 100644
--- a/swamid-2.0/lingon.ladok.umu.se-8087-re_nren_hei-sp.xml
+++ b/swamid-2.0/lingon.ladok.umu.se-8087-re_nren_hei-sp.xml
@@ -3,15 +3,9 @@
   <ns0:Extensions>
     <ns1:EntityAttributes>
       <ns2:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <ns2:AttributeValue xsi:type="xs:string">
-          http://www.swamid.se/category/research-and-education
-        </ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">
-          http://www.swamid.se/category/nren-service
-        </ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">
-          http://www.swamid.se/category/hei-service
-        </ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
     <ns4:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
diff --git a/swamid-2.0/lingon.ladok.umu.se-8087-re_nren_sfs-sp.xml b/swamid-2.0/lingon.ladok.umu.se-8087-re_nren_sfs-sp.xml
index 9418c984..87459ebf 100644
--- a/swamid-2.0/lingon.ladok.umu.se-8087-re_nren_sfs-sp.xml
+++ b/swamid-2.0/lingon.ladok.umu.se-8087-re_nren_sfs-sp.xml
@@ -3,15 +3,9 @@
   <ns0:Extensions>
     <ns1:EntityAttributes>
       <ns2:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <ns2:AttributeValue xsi:type="xs:string">
-          http://www.swamid.se/category/research-and-education
-        </ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">
-          http://www.swamid.se/category/nren-service
-        </ns2:AttributeValue>
-        <ns2:AttributeValue xsi:type="xs:string">
-          http://www.swamid.se/category/sfs-1993-1153
-        </ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
     <ns4:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
diff --git a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
index 37abc1b4..641e44e1 100644
--- a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
+++ b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
@@ -20,6 +20,8 @@
     <mdattr:EntityAttributes>
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
         <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
index 3bae9088..cb01011e 100644
--- a/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
@@ -18,7 +18,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <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: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>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-coc-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-coc-sp.xml
index a085e78f..00898f3e 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-coc-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-coc-sp.xml
@@ -3,7 +3,7 @@
   <ns0:Extensions>
     <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
       <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
-        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.edugain.org/dataprotection/coc-eu-01-draft</ns2:AttributeValue>
+        <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
   </ns0:Extensions>