Merge branch 'master' of git.swamid.se:swamid-metadata

author: Leif Johansson <leifj@sunet.se> 2017-10-25 01:14:04 +0200
committer: Leif Johansson <leifj@sunet.se> 2017-10-25 01:14:04 +0200
commit: beeefe7860770d9b27de2542cc61e5cd40ce74ae (patch)
tree: 4d4d6ebff8d42610d39c02999d1d9b235e0d0133 /swamid-2.0
parent: 67c4181d2ee34d5b021674f297cef753b78e5835 (diff)
parent: c3c13ddb19083c1d000d4ace32a5136158d917f0 (diff)
13 files changed, 481 insertions, 22 deletions
diff --git a/swamid-2.0/comanage.sunet.se-shibboleth.xml b/swamid-2.0/comanage.sunet.se-shibboleth.xml
index a9eb98d9..77ce0acc 100644
--- a/swamid-2.0/comanage.sunet.se-shibboleth.xml
+++ b/swamid-2.0/comanage.sunet.se-shibboleth.xml
@@ -30,8 +30,34 @@ and do *NOT* provide it in real time to your partners.
   </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://comanage.sunet.se/Shibboleth.sso/Login"/>
-      <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://comanage.sunet.se/Shibboleth.sso/Login" index="1"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/nordu.net"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/nordu.net" index="1"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/kalmar2"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/kalmar2" index="2"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/feide"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/haka.funet.fi"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/haka.funet.fi" index="3"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/idp.funet.fi"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/eduid-dev"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/eduid"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/unitedid"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/skolfederation"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/skolfederation" index="4"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/kalmar2"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/kalmar2" index="5"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/nightly.pyff.io"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/nightly.pyff.io" index="6"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/md.nordu.net"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/md.nordu.net" index="7"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/swamid-test"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/swamid-test" index="8"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/loopback"/>
+      <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://comanage.sunet.se/Shibboleth.sso/DS/loopback" index="9"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/box-idp.sunet.se"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/box-idp.nordu.net"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/socialproxy"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/openidp"/>
+      <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://comanage.sunet.se/Shibboleth.sso/Login/necs.sll.se"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Sunets COmanage (test)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Sunet's COmanage (test)</mdui:DisplayName>
diff --git a/swamid-2.0/dev.valda.uhr.se-shibboleth.xml b/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..90ad906c
--- /dev/null
+++ b/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.valda.uhr.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"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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: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>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://dev.valda.uhr.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://dev.valda.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <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://dev.valda.uhr.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Valda</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Valda</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ärendehanteringssystem för valideringar inom olika områden</mdui:Description>
+        <mdui:Description xml:lang="en">Case management service for various validation procedures</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uhr-1297.i.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhr-1297.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAK9uhgtga6STMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXVoci0xMjk3LmkudWhyLnNlMB4XDTE0MTIwMjEyNDgyM1oXDTI0MTEyOTEy
+NDgyM1owHDEaMBgGA1UEAxMRdWhyLTEyOTcuaS51aHIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDSxkWORCuz0qV48LpqRMlD6H4eEe8tbGAvr0N2
+KBmz+l9FBeCBr3Q8NgTeBBnMa23i3VbEdB1016jdJ0h9jXMHN1AQMd/3tR2EoWWM
++VjFmffjIfF0LBYyHJakmnEKmdIwjKPiVqOgwlS+a9af/wiI8XnD8sIaqFopaoA1
+hKKuANSR/TVOkDhKfdaBQcDUCyww2/sGBthhDdlC0rpgRr6nA/vbrjsYRC7PE6js
+2wFzTcMkF9gjeduKZDwpRqQdkSkIL2K1/ZBptaPOOaal6fpve6AcxmjSWZHmR3Tb
+x6ylG3e+B8O8ArwyNyam4TSMhFO57GqVuAtD8Q4uRdq3XSUzAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXVoci0xMjk3LmkudWhyLnNlMB0GA1UdDgQWBBR9FQbRYBUqAd81
+DwOhDd+M8XDmyjANBgkqhkiG9w0BAQUFAAOCAQEAd68cfIyNUjLMpTTQuKQBJs9W
+im084wgTvsAdycV9EbYuuLrQhALQuTuGhBf8qZY16gx23ICpn12nwcXdu02Xcg5U
+xK8cv3PFIgOcXB00dfmOkwwzgtZkYuRZz4bzf4TgrQv9vMhrVJEwHPog4HuU6N8l
+JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
+3N5QAVVFxkbyHn+8RkZQZ9FiWh7Yl56wU3gvGnZrPT2AaJtVaW4cQkw0gL+dAYfm
+3osR1KprOY0+GpXcvgi9X9YlLMzfcsBIiCEoV4wjwziY99phU80XLkFKmYLsmA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.valda.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.valda.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.valda.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.valda.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.valda.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.valda.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.valda.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.valda.uhr.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.valda.uhr.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.valda.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.valda.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.valda.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.valda.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Carina</md:GivenName>
+    <md:SurName>Lindström</md:SurName>
+    <md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
index acbe9277..d0ebb9fa 100644
--- a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
+++ b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
@@ -22,7 +22,7 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIFyzCCA7OgAwIBAgIJAI9LJsUJXDMVMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEOMAwGA1UECgwFU1VORVQxDzANBgNVBAsMBlNXQU1JRDEkMCIGA1UEAwwbU1dBTUlEIG1ldGFkYXRhIHNpZ25lciB2Mi4wMB4XDTE2MTIwNjA5MjgyMFoXDTM2MTIwNjA5MjgyMFowfDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTVU5FVDEPMA0GA1UECwwGU1dBTUlEMSQwIgYDVQQDDBtTV0FNSUQgbWV0YWRhdGEgc2lnbmVyIHYyLjAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQVw72PnIo9QIeV439kQnPcxZh/LddKw86eIU+nMfl4TpjSIyqTu4KJSnXbJyqXg+jQj3RzE9BUblpGrR7okmQwOh2nh+5A6SmyTORp7VEVT/Zw0GNnQi9gAW7J8Cy+Gnok4LeILI5u43hPylNKAnvs1+bo0ZlbHM6U5jm6MlO+lrYA9dZzoPQqoCQbr3OweAaq5g8H54HuZacpYa3Q2GnUa4v+xywjntPdSQURTAbWWyJl3cHctX5+8UnX8nGCaxoBZqNp9PcEopyYJX8O1nrLumBMqu9Uh6GW1nxOHfKDLvUoykG3Dm704ENVs88KaJXB1qQNsjdlm14UI9XCZbHfnFVnQ53ehsGFMhaBf/Abd6v2wnhBLH/RxEUlw347qSeokw+SdDTSdW8jOEBiSqP/8BUzpCcbGlgAsVONKUS0K7IB2Bb79YYhyMvmJl24BGtkX+VM/mv47dxOtfzNFCMtUcJ2Dluv0xJG8xIot7umx/kbMBLuq7WdWELZJrgpt2bb9sXtYBpuxtGCW5g7+U7MNN1aKCiCSfq09YHqu2DsU7HHAxEcGFXBiepBliCwZ24WLQh53bA3rihaln7SjdapT9VuSTpCvytb9RXrq39mVuHMXvWYOG20XTV0+8U2vnsjAwsy28xPAcrLWRWoZbRJ+RoGp6L3GACq+t+HPIukwIDAQABo1AwTjAdBgNVHQ4EFgQUQ2iqKQV/mMZDeJDtLXvy0Bsn/BQwHwYDVR0jBBgwFoAUQ2iqKQV/mMZDeJDtLXvy0Bsn/BQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAHviIAfS8viUN8Qk//U1p6Z1VK5718NeS7uqabug/SwhLVxtg/0x9FPJYf05HXj4moAf2W1ZLnhr0pnEPGDbdHAgDC672fpaAV7DO95d7xubcrofR7Of2fehYSUZbXBWFiQ+xB5QfRsUFgB/qgHUolgn+4RXniiBYlWe6QJVncHx+FtxD+vh1l5rLNkJgJLw2Lt3pbemSxUvv0CJtnK4jt2y95GsWGu1uSsVLrs0PR1LjkuxL6zZH4Pp9yjRDOUhbVYAnQ017mdcjvHYtp7c4GIWgyaBkDoMtU6fAt70QpeGjXhecXk7Llx+oYNdZn14ZdFPRGMyAESLrT4Zf9M7QS3ypnWn/Ux0SwKWbnPUeRVbOVZZ+M0jmdYK6o+UU5xH3peRWSJIjjRaKjbVlW5GgHwGFmQc/LN+va2jjThRsQWWtzEwObijedInQ6wfL/VzFAwlWWoDAzKK9qnK4Rf3ORKkvhKrUa//2OYnZD0kHtHiCOL+iFRLtJ/DQP5iZAF+M1Hta7acLmQ8v7Mn1ZR9lyDWzFx57VOKKtJ6RAmBvxOdP8cIgBNvLAEdXh2knOLqYU/CeaGkxTD7Y0SEKx6OxEEdafba//MBkVLt4bRoLXts66JY25FqFh3eJZjR6h4W1NW8KnBWuy+ITGfXxoJSsX78/pwAY+v32jRxMZGUi1J4=</ds:X509Certificate>
+          <ds:X509Certificate>MIIFAzCCAuugAwIBAgIJAONjaHZu0gBEMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNVBAMTFGRpc2t1cy1kZW1vLnViLnV1LnNlMB4XDTE3MTAwNTE0MTgwNVoXDTI3MTAwMzE0MTgwNVowHzEdMBsGA1UEAxMUZGlza3VzLWRlbW8udWIudXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC7TVocn7onWp4lnTIBFETrHkW3FWi78t/vqaRu/FodUpJFXCSjvYUKNcsX0krwA8sDsZxOxQnlbyY2BE0byA/fe9bz43BDhJ30FJPFQlC+1oNJbTchYIEtr84GzxThZJ4EAh0AE7X+4NjJOsLmjUeDU5cQhVZwmvNEFA9R4LBoJaGksXYGSGIpEVu0sUmDBVjz+1Z1HL1Kyogim4mDDhIdDYIvAT5TzQyNCfRtrk+hr/L38/8mvlkEIRpipBVveQR+PaQxK1/3NGNoLaxJ4IbJvUP+iQifeL1/yR/UwBeEHRhyO+QFEvgGArFidGvlhI5XgO6O1v2tzwd5T9biIbnP1uQL4cq88cKfYUiynkrDFU6kTAHyzCKTlYQJlzEdm7VwJshkyY+hOxEh7XEqmWBRDZDrs40ZqBBU4mm0QPKBtpnEESzxqipK93ZSpxmXRaPkEBJnQFGgCFkAR6DCjH6WU4b0YvW91EWyo9SMNn+rVLuAn9OcUfXIe5And13tzFkXVGYOK3yBa4vB5Wdc8NNhNizjsVVxeeR3DXeOXWOzbm3+0hqX911jM/x/6ObGBjfNSKKGLZseeXyd3pKKPLhAKX4NkyyX2oCg+0+p3e5v+SUZWu4iyYrL67RVV5r4IcTAfksvm943tRPrcXBOMP+iOQo+tgD4ohgBeDLfeyZF1QIDAQABo0IwQDAfBgNVHREEGDAWghRkaXNrdXMtZGVtby51Yi51dS5zZTAdBgNVHQ4EFgQUO8e0nyEavzg32Fnb66bjvKwm+YEwDQYJKoZIhvcNAQELBQADggIBAHES+bIaGmfdxEcq45fbP1vfFHpLjLKXH7vXRu4E85fiwx6Z3oWIF31e+lNyYjfQ45dslo9t5qG4qPg4mLVivw9NkmjpO2zWc5RhNsrjStp8Mawc3PHTMAkmOc+O9sm1hZA4BzEiW5AjjwipAFx1CzftybTJZO+4L7AGeFy1ykVVhlKTBEpybJdgCoB4Y+ZeWht6dBs7SbkP92hyNWlNPMiCOJKUIXptI5F2f7WNKuAUQ4a3j4/S/T3P3mr4A82lLR9vlt7QuTnp05PzAKsuWMT22o/Xvp5a0y2Q3IMcO2TL7nsX3jXVvNSFRXSvgRrcGjqNFJJqoeXMXrdOf6i4fxSFQ1QU7Cl1Z8NVRobMNfi25qpQHx9oUjoadnCK/fv8pNoXx75RiaRF5iz7G6wUZn9HzonVK6+RVFGbuJH3UcRX4IC/QVa5Ut8b4c9cveqKFMCi2FZF/aFkUAwqx4TzERkDFXbojV6Vyw0o0tLZTLXhn1uWG57OGQ78BJVZ247INbyOumPukIxDGWXsLDedfA/iVQqjD3VkGSxkS21elrvzHYhOgI7mTMCG3zOjusPcXH5zegYh0Q27F+2w4Pphak3EyELViMTIP5MuDNXfU6j0g6pMfVWkTbN/QqrfsT+ElXbZmfz5ETINyZtApewYTsa2Ew/c4S/aXeAEJ5x75WsZ</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index cd1e2c9c..dc551949 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -6,6 +6,8 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
         <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </Extensions>
@@ -307,6 +309,16 @@ wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
     </fed:PassiveRequestorEndpoint>
   </RoleDescriptor>
   <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Linköpings universitet (ADFS)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University (ADFS)</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/artikel/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
diff --git a/swamid-2.0/login.ifmsa.se-spp.xml b/swamid-2.0/login.ifmsa.se-spp.xml
new file mode 100644
index 00000000..033f6a40
--- /dev/null
+++ b/swamid-2.0/login.ifmsa.se-spp.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.ifmsa.se/spp/">
+  <md:Extensions>
+    <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAPUaUO5bRa64MA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDHNzby5pZm1zYS5zZTEdMBsGCSqGSIb3DQEJARYOYWRtaW5AaWZtc2Euc2UwHhcNMTcwNTAzMjMyMDMxWhcNMjcwNTAzMjMyMDMxWjCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRUwEwYDVQQKDAxJRk1TQS1Td2VkZW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxzc28uaWZtc2Euc2UxHTAbBgkqhkiG9w0BCQEWDmFkbWluQGlmbXNhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqEKGL1JENpM37DWbR+tGv/EIJBJsMkaBPmV/j191k3d213Y1NuEAl3tEtpFto0lL8iugd5yx0Kp03tFI91HZxChwekKdw4+VIQnIuSDFklvm/FxnjDC4OXVObqq0MNbrQkzW495WJm9QjB+mYWgd+raJcYc8JWXs59Rk8xGUaecGZ+7s/a9sOqQjso8ZLmpghkqv22i6AAYzZW9TH6Dzv0uDKXazYSyq7ZwdbYSkrlRoGllyp2x0fqXg2NfHO/6UolIlywthik+yjIe6wk/u3Z06+ecq6IZR5XfwCl3saZOaDiAANbgFfOQ9JVKLeaAXZx41QJthxY88hjmhoYQS4wIDAQABo1AwTjAdBgNVHQ4EFgQUOWCfIfmnkbMwdZ/xxgK8Wyu+BVUwHwYDVR0jBBgwFoAUOWCfIfmnkbMwdZ/xxgK8Wyu+BVUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAWlTkZLI9gAG92PrOE7U2ycEeHwRyktFyZXrazOhE+SUbJCqLvG4GyJWhN3FNy+OhpQfdwIg+WPMjnKekfDfpLpRR4QFAbuirwJfq9euZyL2fFO/nzNTYygpDgqmp/1OyflqodXjdhUvCWtGXwvpGgfexn5SslQdxLfEIaebP0XxrzqPBDY7pMyzpuq6LPgdse6T28U0jVcFScx/n0ZO/Lwc0tAFS8MSmMb4P+/T3mwNXrRuux3VguXHp3NGdr1c0whRd3Z3YewwTLGSKfENbu5aoGqHb5fMNXZEZmbmirM5EnuN1HX2wMEa3f97z1OwR4FqNFlpfp1MgZI13Xq2LGQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAPUaUO5bRa64MA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDHNzby5pZm1zYS5zZTEdMBsGCSqGSIb3DQEJARYOYWRtaW5AaWZtc2Euc2UwHhcNMTcwNTAzMjMyMDMxWhcNMjcwNTAzMjMyMDMxWjCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRUwEwYDVQQKDAxJRk1TQS1Td2VkZW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxzc28uaWZtc2Euc2UxHTAbBgkqhkiG9w0BCQEWDmFkbWluQGlmbXNhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqEKGL1JENpM37DWbR+tGv/EIJBJsMkaBPmV/j191k3d213Y1NuEAl3tEtpFto0lL8iugd5yx0Kp03tFI91HZxChwekKdw4+VIQnIuSDFklvm/FxnjDC4OXVObqq0MNbrQkzW495WJm9QjB+mYWgd+raJcYc8JWXs59Rk8xGUaecGZ+7s/a9sOqQjso8ZLmpghkqv22i6AAYzZW9TH6Dzv0uDKXazYSyq7ZwdbYSkrlRoGllyp2x0fqXg2NfHO/6UolIlywthik+yjIe6wk/u3Z06+ecq6IZR5XfwCl3saZOaDiAANbgFfOQ9JVKLeaAXZx41QJthxY88hjmhoYQS4wIDAQABo1AwTjAdBgNVHQ4EFgQUOWCfIfmnkbMwdZ/xxgK8Wyu+BVUwHwYDVR0jBBgwFoAUOWCfIfmnkbMwdZ/xxgK8Wyu+BVUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAWlTkZLI9gAG92PrOE7U2ycEeHwRyktFyZXrazOhE+SUbJCqLvG4GyJWhN3FNy+OhpQfdwIg+WPMjnKekfDfpLpRR4QFAbuirwJfq9euZyL2fFO/nzNTYygpDgqmp/1OyflqodXjdhUvCWtGXwvpGgfexn5SslQdxLfEIaebP0XxrzqPBDY7pMyzpuq6LPgdse6T28U0jVcFScx/n0ZO/Lwc0tAFS8MSmMb4P+/T3mwNXrRuux3VguXHp3NGdr1c0whRd3Z3YewwTLGSKfENbu5aoGqHb5fMNXZEZmbmirM5EnuN1HX2wMEa3f97z1OwR4FqNFlpfp1MgZI13Xq2LGQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ifmsa.se/spp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ifmsa.se/spp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ifmsa.se/spp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ifmsa.se/spp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ifmsa.se/spp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFMSA-Sweden</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">IFMSA-Sweden</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">IFMSA-Sweden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">www.ifmsa.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Admin</md:GivenName>
+    <md:EmailAddress>admin@ifmsa.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
index 446bf6ba..ca227eaa 100644
--- a/swamid-2.0/scalear-staging2.herokuapp.com.xml
+++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml
@@ -48,7 +48,8 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-staging2.herokuapp.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
@@ -65,14 +66,14 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">scalear-staging2.herokuapp.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://scalear-staging2.herokuapp.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
-    <EmailAddress>support@scalable-learning.com</EmailAddress>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
-    <EmailAddress>support@scalable-learning.com</EmailAddress>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sp.haikom.com-saml-kph-test.xml b/swamid-2.0/sp.haikom.com-saml-kph-test.xml
new file mode 100644
index 00000000..dc497669
--- /dev/null
+++ b/swamid-2.0/sp.haikom.com-saml-kph-test.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.haikom.com/saml/kph-test">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets visitkortsportal (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University business cards portal (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets visitkortsportal används för beställning av visitkort.</mdui:Description>
+        <mdui:Description xml:lang="en">The Uppsala University business cards portal is used for ordering business cards.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=860972</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=860972</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIIcS3igxdPcxEwDQYJKoZIhvcNAQENBQAwgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb20wHhcNMTcwOTE2MDAwMDAwWhcNMzcwOTE2MDAwMDAwWjBOMRYwFAYDVQQDDA1zcC5oYWlrb20uY29tMQ8wDQYDVQQKDAZIYWlLb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWmhC8VIJsSOSArrsO/jRgukGxCbX+0KyIzA2aNcsi9GDvYIMnf9m4P/uhVK7YFrsaC6BvWv38mdZP3oW4tOVX5J9XuiMwH+mOJajyNvMqaMebWLbwJJ2mDSC/4kX9y5tn+y/Fwu3+QMnRApVQCLWL+Pr5z7xeq4gpETsC8KnDqRq3jNSRClYmZzU3UNFb5wKIcLFJ7ShQpFi5tORhNeX1Y8ziUJgUChKlvrqI9Xxs+whEtMjqmqB6P/8NDR35y8bzmv8FlfNdJQXP8XG+icTXAOsuI78fIQQl860v+BiuCHIr3nzHcZIkeXP1E5skVE8G521TzALacNABvMKRUhCQIDAQABo4IBBDCCAQAwgdAGA1UdIwSByDCBxYAUUlkcUX7NJ5BrsANXn7DX2or8t2ihgaKkgZ8wgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb22CCHEt4oMXT3MRMB0GA1UdDgQWBBRSWRxRfs0nkGuwA1efsNfaivy3aDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAESl1nr0+3TNo3KEh2UPykyi/2XrYrfMU4Yu7FMQPYPcyNqjumUumzX/fjwHP/yWeNZ7F3L+2npQicZ/04o4sNwzhixuZ2fSv/s5PTvpbwQzBEbTitLkr/ki1PTLQp12yIN6EWkmpxdsnfMEvY3arV3e6Le8c2dVZSIUomuDYg38KhEoj22yPUYsBCxKv7mWBB4H/BJ6rOxAlJ00T4FOCKttj4qajKuEK3T9rbQ2CMnhxLB2WPcWUSE8oprLZSNwqDSWzhnn0YZEWRKj2jd3RuFsnSBTlroYwiUgfiLTWOj3bTcw5/B5uty2TVAqmWTA4fAQUgZn3JBJ7SeeGbaQdc</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIIcS3igxdPcxEwDQYJKoZIhvcNAQENBQAwgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb20wHhcNMTcwOTE2MDAwMDAwWhcNMzcwOTE2MDAwMDAwWjBOMRYwFAYDVQQDDA1zcC5oYWlrb20uY29tMQ8wDQYDVQQKDAZIYWlLb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWmhC8VIJsSOSArrsO/jRgukGxCbX+0KyIzA2aNcsi9GDvYIMnf9m4P/uhVK7YFrsaC6BvWv38mdZP3oW4tOVX5J9XuiMwH+mOJajyNvMqaMebWLbwJJ2mDSC/4kX9y5tn+y/Fwu3+QMnRApVQCLWL+Pr5z7xeq4gpETsC8KnDqRq3jNSRClYmZzU3UNFb5wKIcLFJ7ShQpFi5tORhNeX1Y8ziUJgUChKlvrqI9Xxs+whEtMjqmqB6P/8NDR35y8bzmv8FlfNdJQXP8XG+icTXAOsuI78fIQQl860v+BiuCHIr3nzHcZIkeXP1E5skVE8G521TzALacNABvMKRUhCQIDAQABo4IBBDCCAQAwgdAGA1UdIwSByDCBxYAUUlkcUX7NJ5BrsANXn7DX2or8t2ihgaKkgZ8wgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb22CCHEt4oMXT3MRMB0GA1UdDgQWBBRSWRxRfs0nkGuwA1efsNfaivy3aDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAESl1nr0+3TNo3KEh2UPykyi/2XrYrfMU4Yu7FMQPYPcyNqjumUumzX/fjwHP/yWeNZ7F3L+2npQicZ/04o4sNwzhixuZ2fSv/s5PTvpbwQzBEbTitLkr/ki1PTLQp12yIN6EWkmpxdsnfMEvY3arV3e6Le8c2dVZSIUomuDYg38KhEoj22yPUYsBCxKv7mWBB4H/BJ6rOxAlJ00T4FOCKttj4qajKuEK3T9rbQ2CMnhxLB2WPcWUSE8oprLZSNwqDSWzhnn0YZEWRKj2jd3RuFsnSBTlroYwiUgfiLTWOj3bTcw5/B5uty2TVAqmWTA4fAQUgZn3JBJ7SeeGbaQdc</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/slo/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/slo/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/Redirect" index="2" isDefault="false"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HaiKom AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HaiKom</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.haikom.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>HaiKom</md:Company>
+    <md:EmailAddress>mailto:support@haikom.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
new file mode 100644
index 00000000..9e669d10
--- /dev/null
+++ b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.spraakbanken.gu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Språkbanken</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Språkbanken</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Inloggning till Språkbankens språkresurser för forskare och allmänheten.</mdui:Description>
+        <mdui:Description xml:lang="en">Login to Språkbanken's language resources available to researchers and to the public.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://spraakbanken.gu.se/eng/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo>
+      </mdui:UIInfo>
+      <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://sp.spraakbanken.gu.se/Shibboleth.sso/DS/Login"/>
+      <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://sp.spraakbanken.gu.se/Shibboleth.sso/DS/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sp.spraakbanken.gu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp.spraakbanken.gu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEBjCCAm6gAwIBAgIJANTqNGS+Meg9MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFXNwLnNwcmFha2Jhbmtlbi5ndS5zZTAeFw0xNzEwMDkwOTMzNDJaFw0yNzEw
+MDcwOTMzNDJaMCAxHjAcBgNVBAMTFXNwLnNwcmFha2Jhbmtlbi5ndS5zZTCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALDidsS0JETlmVQttP/ZWkfHOuz5
+dWSo2jUSLK61yRNN1Ti7ZYrv8O4shEvKzhDxXMUKoiGWvzvKArE6ELrjBvpWciJj
+f5clh4NkKVrRUqQiHONO4f3XVFOJ2WGGHHK7if1YHuCdKUYbkuUjJ1f+GPVEInT2
+0cS2TO/BEpR859sJFghx55CH6ovg5PjvGp+apfA1Nh40Snp3Ssf6lES/Z2lLJNeF
+bfidkt4gkwGjnusQUcirtY4MpN6oEusyhU81Ly6pJOydcBaZzFxVkrbf1PTmfYcX
+8j7muuMMFKYMf+vYtL9rkx+kRtA8T0nESJCrovWVRoUJujGlq3yUFI6d8hiPYr2x
+xUOhia5EeLQOKevinvwvcnl51txwMtoc3WlVWHl5qv21JWupw4l5R98E+GEui2av
++lpEnxluIM0fqnU/QO0j1QkmRP5o73kloms39CJMALWgLwUZXEe5M4EDnjF+4Oa4
+LocWuj/S1HO8SYEjUky0Rc3x1YHjz1qlNoBHrwIDAQABo0MwQTAgBgNVHREEGTAX
+ghVzcC5zcHJhYWtiYW5rZW4uZ3Uuc2UwHQYDVR0OBBYEFK5gYOUKyVkjcyJfveEq
+7qMCNF0dMA0GCSqGSIb3DQEBCwUAA4IBgQBz6Tr80qXJK3QztV4NQtns+eysSkR5
+MZYLA/8Au3khfvLKm851pbcNm8kIydWcHy3L/y+k4dBTurmYPNmqIJcn4V6+E8oW
+9RKcDbxxan8Z+epZinedR86Cl//BcGYCvd1VLnnLwC/otMaVvBJUTGKHW8AXIsoU
+YdaaogtWv+aMarnmggvq1op2mkLodvUvJqNU+5W3mtLRlNweQWAn0WSfSlnQb98H
+HINifOI9yhkw+kgayV/Vs9yhvRetSJFdxJy/RsIzsiBCB5gi/5jbCEyZKjthp1l2
+jJ/LCxMnNdmERg9Knn+fvYwDqAbvt5lvI0YjKHwyU/TVx4uAx/Yn0A62ZlXs1SxS
+quocDzbyT+8G/2hgINlcXMeffSNIxF0Bnqr7t0twwmz3jEXljt/5Xmawk63+sKnk
+XY2YJNAZj6iK43EuFEAVfDchxTI02c8/1RpjTipSSLbV7jzrUoz8wuY7zlLSrODG
+B1l+7GujpIQqv3B1RJA3m+G632LPFkBZgFM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Språkbanken</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Språkbanken</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Språkbanken's language resources available to researchers and to the public.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Språkbankens språkresurser för forskare och allmänheten.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <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="false"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Språkbanken</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Språkbanken</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Språkbanken</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Språkbanken</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://spraakbanken.gu.se/eng/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Lars</md:GivenName>
+    <md:SurName>Borin</md:SurName>
+    <md:EmailAddress>mailto:sb-info@svenska.gu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Carl-Johan</md:GivenName>
+    <md:SurName>Schenström</md:SurName>
+    <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carl-Johan</md:GivenName>
+    <md:SurName>Schenström</md:SurName>
+    <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test.scalable-learning.com.xml b/swamid-2.0/test.scalable-learning.com.xml
index db561c6f..04562a54 100644
--- a/swamid-2.0/test.scalable-learning.com.xml
+++ b/swamid-2.0/test.scalable-learning.com.xml
@@ -47,14 +47,13 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>
-   urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-  </md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://test.scalable-learning.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education. </md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</md:ServiceDescription>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
@@ -66,14 +65,14 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">test.scalable-learning.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://test.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
-    <EmailAddress>support@scalable-learning.com</EmailAddress>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
-    <EmailAddress>support@scalable-learning.com</EmailAddress>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml b/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml
new file mode 100644
index 00000000..a2172dd9
--- /dev/null
+++ b/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.valda.i.uhr.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"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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: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>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://test.valda.i.uhr.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://test.valda.i.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <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://test.valda.i.uhr.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Valda</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Valda</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ärendehanteringssystem för valideringar inom olika områden</mdui:Description>
+        <mdui:Description xml:lang="en">Case management service for various validation procedures</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uhrval-test.i.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhrval-test.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAKrvj/quXo0oMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHVocnZhbC10ZXN0LmkudWhyLnNlMB4XDTE0MTIwODA5MTExMVoXDTI0MTIw
+NTA5MTExMVowHzEdMBsGA1UEAxMUdWhydmFsLXRlc3QuaS51aHIuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtIWX5i6gPePK7nbap8snxwcLqlCID
+LWZkxbQGCVIgixRk1w87yUD882SSZjUATS8JV+8TeHNIsRSkBeXB1MQQopeDtm5C
+LDhh/RxHL3IRBlhesOE5zWcc4xeBzRIBKb1OC773XbSLx1lQhZmH+fiQvEk5FfWG
+ri683HBCQq3gpc3hX2lY7C7oAxL7KST+37zLIBy7c83fzWr3eQ1myKZFfHBsmMOt
+pNjBNMG8V924gaHWKAuqDa6lds53PszYZh27bN7dWXRrN0vXEZu6zfEioJVvg5RL
+c0lUqg/yu8Dk9JYYm9rQDj007livs9QllR54wsIxosVQWhAz36ZFafaNAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHVocnZhbC10ZXN0LmkudWhyLnNlMB0GA1UdDgQWBBSG
+EGTlhQfKssjt+WgDPIKFHzzZEDANBgkqhkiG9w0BAQUFAAOCAQEAOHImN37aqOBU
+wicsP5vJ7X8yX6he/dAnRKhZbjWSlpFSZGwZrV/B6YeROAyRbzQH1fQRTup+angF
+B5m+vmxG0XjhUm8gXpMNqjgxaay72m2rPTVAkbqkMNTKNf44bRK5OGqPlJ0lwrnC
+Wh1+2EdKahr4lzJaqiW2rXvX3moTYqrJlssglT+IRTzoNbL6eQLdqCVvZxXDjyUb
+D79D+ECq8yjkS4/8EQlvHdHozRMMplJTo+pXoZwV9KZgMMsxdT63VuJ/0HRCxCMC
+zcmOSN36LTlSIYY4q9pC8MCzt5YqZdnKJUIyjFy+Mmjeyw4t+ouUjjI6+AifCten
+BwquFopAQg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.valda.i.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.valda.i.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.valda.i.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.valda.i.uhr.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.valda.i.uhr.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.valda.i.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Carina</md:GivenName>
+    <md:SurName>Lindström</md:SurName>
+    <md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
index 715a9a4d..37abc1b4 100644
--- a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
+++ b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
@@ -20,6 +20,7 @@
     <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:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -78,6 +79,8 @@ xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify-l.myunidays.com/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify-l.myunidays.com/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify-l.myunidays.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify-l.myunidays.com/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify-l.myunidays.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify-l.myunidays.com/Shibboleth.sso/SAML2/ECP" index="4"/>
@@ -113,4 +116,8 @@ xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
     <md:SurName>Buxey</md:SurName>
     <md:EmailAddress>mailto:alan.buxey@myunidays.com</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SAML Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:shibadmin@myunidays.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
index 079941c1..c8b4940f 100644
--- a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
+++ b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -625,7 +625,6 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/" index="0" isDefault="true"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webproxysrv.uniarts.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/" index="2"/>
   </SPSSODescriptor>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
index 46fa4778..649c8f59 100644
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -47,12 +47,13 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://www.scalable-learning.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education. </md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</md:ServiceDescription>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
@@ -64,14 +65,14 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
-    <EmailAddress>support@scalable-learning.com</EmailAddress>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
-    <EmailAddress>support@scalable-learning.com</EmailAddress>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2017-10-25 01:14:04 +0200
committer	Leif Johansson <leifj@sunet.se>	2017-10-25 01:14:04 +0200
commit	beeefe7860770d9b27de2542cc61e5cd40ce74ae (patch)
tree	4d4d6ebff8d42610d39c02999d1d9b235e0d0133 /swamid-2.0
parent	67c4181d2ee34d5b021674f297cef753b78e5835 (diff)
parent	c3c13ddb19083c1d000d4ace32a5136158d917f0 (diff)