From ca2f04cc602018cd5456e67f527353093583cdbc Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sat, 19 Mar 2016 00:04:40 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 ...ayf.hi.is-simplesaml-saml2-idp-metadata.php.xml | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml')

diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
index c95e2678..29a30936 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.hi.is/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.hi.is/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:31:35Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:31:35Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <saml:Attribute Name="tags">
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
-      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
-    </saml:Attribute>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
-      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hi.is</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="da">Háskóli Íslands</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Iceland</mdui:DisplayName>
       </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hi.is</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIC8jCCAdoCAQcwDQYJKoZIhvcNAQELBQAwPzE9MDsGA1UEAww0aHR0cHM6Ly93
 YXlmLmhpLmlzL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0x
@@ -52,4 +50,9 @@ dGs7tUiZlHqo6haH9iSvsbsBOq6pPaZR8cX1As206778PAS6Q6U=
     <md:OrganizationURL xml:lang="da">http://www.hi.is</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.english.hi.is</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>WAYF</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3