From e12b5d9b80abbe875824dd98c2782e592281588b Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 7 Jun 2016 14:52:05 +0200
Subject: 
 https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml
 into swamid-interfederations-2.0

---
 .../sp.www.kielipankki.fi.xml                      | 34 +++++++++-------------
 1 file changed, 14 insertions(+), 20 deletions(-)

(limited to 'swamid-interfederations-2.0/sp.www.kielipankki.fi.xml')

diff --git a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
index 8c70b7d5..b836db6a 100644
--- a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
+++ b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.www.kielipankki.fi">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.www.kielipankki.fi">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <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://www.kielipankki.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kielipankki.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Kielipankki</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Kielipankki (The Language Bank of Finland)</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Kielipankin portaali</mdui:Description>
@@ -24,9 +14,13 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <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">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIGOjCCBSKgAwIBAgIQBEdR8xdmmq3NYQebTVAwOjANBgkqhkiG9w0BAQ0FADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
@@ -73,12 +67,12 @@ ukUJvoKA4qzHcF2rQn4=</ds:X509Certificate>
       <md:ServiceName xml:lang="en">Kielipankki (The Language Bank of Finland)</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Kielipankin portaali</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Web portal of the Language Bank of Finland</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-- 
cgit v1.2.3