From 13d9137931646ba3b50a452cd8e21a6ba5e7c679 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Mon, 13 Nov 2017 11:19:57 +0100
Subject: Resolved SWAMID-302 + got some updates on sirtfi-check.swamid.se on
 make commit

---
 swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml | 4 ++--
 swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml   | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index a2279075..5d94ca78 100644
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -209,13 +209,13 @@ CQNfH97cIrTE5N/RQ7XWcw==
   <ContactPerson contactType="technical">
     <Company>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
-    <EmailAddress>mailto:matsl@irf.se</EmailAddress>
+    <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
     <TelephoneNumber>+4698079022</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
-    <EmailAddress>mailto:matsl@irf.se</EmailAddress>
+    <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
     <TelephoneNumber>+4698079022</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
index 130c9593..99f43a8a 100644
--- a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
@@ -1,9 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_e0a0471d92dd17184539a705492ec6fb40777fec" entityID="https://sirtfi-check.swamid.se/shibboleth">
-
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sirtfi-check.swamid.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -23,11 +23,10 @@ and do *NOT* provide it in real time to your partners.
     <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/DS/nordu.net"/>
@@ -109,10 +108,8 @@ JRf9VO1D1PoLKLI1hA==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-
   <md:ContactPerson contactType="technical">
     <md:GivenName>Technical</md:GivenName>
     <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
   </md:ContactPerson>
-
 </md:EntityDescriptor>
-- 
cgit v1.2.3