From 1d3779d45b18a66a098ab9a44a73b3a896652fd0 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sun, 7 Apr 2019 16:51:02 +0200
Subject: new ra21 SPs

---
 swamid-2.0/acs-ra21.mnt.se-shibboleth.xml          | 41 +++++-----
 swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml          | 87 +++++++++++++++++++++
 .../taylor-francis-ra21.mnt.se-shibboleth.xml      | 88 ++++++++++++++++++++++
 swamid-sp-2.0.mxml                                 |  2 +
 4 files changed, 199 insertions(+), 19 deletions(-)
 create mode 100644 swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
 create mode 100644 swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml

diff --git a/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml b/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
index 3255d577..a6efcde4 100644
--- a/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
@@ -22,33 +22,36 @@
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">ACS Publications</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ACS Publications</mdui:Description>
+        <mdui:Description xml:lang="en">ACS Publications Demo</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://ra21.org/</mdui:InformationURL>
       </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://acs-ra21.mnt.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://acs-ra21.mnt.se/Shibboleth.sso/Login" index="1"/>
+      <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://acs-ra21.mnt.se/Shibboleth.sso/Login" index="2"/>
+      <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://acs-ra21.mnt.se/Shibboleth.sso/Login" index="3"/>
+      <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://acs-ra21.mnt.se/Shibboleth.sso/Login" index="4"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>acs-ra21.mnt.se</ds:KeyName>
+        <ds:KeyName>demo-publisher-4</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=acs-ra21.mnt.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAO3DfSjX7lyrMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Fjcy1yYTIxLm1udC5zZTAeFw0xODA0MDYxMDA3MTRaFw0yODA0MDMxMDA3
-MTRaMBoxGDAWBgNVBAMTD2Fjcy1yYTIxLm1udC5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJo2iX77xSlxmz4VXHnfe4M2yf8ehUyOfMdsgz6ml3E2
-Vt/zY8ncazQ2mxlPgFdQArBknuCqaOBjhgMatlOEAnkD2/oRbCcuKi9H4GWbASR8
-RhvPLA02/TVH6bwiyJOvCFVu8o7hc4tuIYHU4D4J5Znk2HH4Wgi8XdBV29w0T491
-DPpmsQAynscvzY4GyWtYThtozFatR107q8gnaNMl7B0AnQM1jKaS7mo1FGnGCxni
-s3UdYPj9hei1OebQb3sVdmI6mKDdxIAjxS0pq+XYnl7dv2678RhII/j87OxvV07A
-/uGa8pHukZVGJv6IlxrvwVRNExfXsse33fThw8o8kB8CAwEAAaM9MDswGgYDVR0R
-BBMwEYIPYWNzLXJhMjEubW50LnNlMB0GA1UdDgQWBBS069IJxHiWtx9EzdUZWYjO
-qUhOfjANBgkqhkiG9w0BAQUFAAOCAQEAQPOiP9bvtKfJipKuJZnldl9UXLyxu7Qz
-eQobqGaD22lr9r//jFXsly0QA5eGsqrJDUalnLS4enZf519E8MJGRyx6fpxGNWAy
-cmWed3D/du6HdzOj7DwA3trrbBaAax6kLGZUh3I6fO9pnQaNyMCRIEhb4gEvGQHJ
-1hcbn3KzsSbsrWiKO8S+XSYsu00ZU+VM5OFzBzcSIDRrm+bcdA+/x2KCZ9cTVRpY
-/kmMnZ60JaSBRPv1jJ7sj1BVVZzfWN/RxC4KMhhLd8awsPgf4dKoArs5sNQO/Q6q
-PviupR4zrQB2Z3UicpQVJewfp9c8GK7wgU3HdGmqrl7DiD14XFHVVQ==
+          <ds:X509SubjectName>CN=demo-publisher-4</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJANdb0ljhbfvWMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGRlbW8tcHVibGlzaGVyLTQwHhcNMTkwNDA0MTk1NTE2WhcNMjkwNDAxMTk1
+NTE2WjAbMRkwFwYDVQQDExBkZW1vLXB1Ymxpc2hlci00MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAp+3KHgrr83L1Nu4tz6JX0O+I4qhRVjxZQqJ/otst
+y2SDEdYVi9FFks/jxldYMO2RFB5SyhMAt62SSoBrvlw5S0tK2IadRZQXxeCBulxa
+4mca7YI6BP7cRTA4yPUW7eonl/IohRB2dNCjqqax3iTPivfOi9h85J8Yw1qT0Cpi
+yuvOGanFFd/4SeTUETHqQre5KSRhywoyxPf5B+PAU3qUK0tJccuSHo/oE/m/dhnr
+TWhUcFzXvJ7+w6MLGrmdl3mAS0mlG+Hlu8TibQyx+ifQseuY7mUnpNq6xcjhI9L7
+VpCmDv0wRdp4F+c5ekHFEMgLzTCqfUuOq0bv7w9yiUdDSwIDAQABoz4wPDAbBgNV
+HREEFDASghBkZW1vLXB1Ymxpc2hlci00MB0GA1UdDgQWBBTXlnH8rQ24B/945INf
+B5C1z+7zIjANBgkqhkiG9w0BAQUFAAOCAQEAVIUtKVwPnycw9dNUOQBLKDnQMcow
+lSs+6hEzp8dHIw++zYDgpcIMoqDsvv1S05bmuJaQ7lmThRWJOl9BewkMhoM4bi0R
+3i/FyuoZ4y6wHACLLxTMxNNSGmGryPACuottWGJsT8P/3sOe3j44hIG97kO5DevW
+171MAfUfK4YVQVHEnuFdAWVl6e45KZYfwbGMjIEiz5rdPY9wAKxojGZxPAHreWGG
+LQbb1fY/gSKB8+aE7wGJ8z0PYSQx2klR5m3dL3uaXRi8qsn8hATqlXLtZe+3SaZZ
+dDjE2u0wTPvH1PGiIKcL9dZV09CRcmR3bTtnI5pg4bcV278uMwRUh04QQg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml b/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
new file mode 100644
index 00000000..bd30631a
--- /dev/null
+++ b/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rsc-ra21.mnt.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"/>
+  </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="en">RSC</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RSC RA21 Demo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://ra21.org/</mdui:InformationURL>
+      </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://rsc-ra21.mnt.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://rsc-ra21.mnt.se/Shibboleth.sso/Login" index="1"/>
+      <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://rsc-ra21.mnt.se/Shibboleth.sso/Login" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>demo-publisher-4</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=demo-publisher-4</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJANdb0ljhbfvWMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGRlbW8tcHVibGlzaGVyLTQwHhcNMTkwNDA0MTk1NTE2WhcNMjkwNDAxMTk1
+NTE2WjAbMRkwFwYDVQQDExBkZW1vLXB1Ymxpc2hlci00MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAp+3KHgrr83L1Nu4tz6JX0O+I4qhRVjxZQqJ/otst
+y2SDEdYVi9FFks/jxldYMO2RFB5SyhMAt62SSoBrvlw5S0tK2IadRZQXxeCBulxa
+4mca7YI6BP7cRTA4yPUW7eonl/IohRB2dNCjqqax3iTPivfOi9h85J8Yw1qT0Cpi
+yuvOGanFFd/4SeTUETHqQre5KSRhywoyxPf5B+PAU3qUK0tJccuSHo/oE/m/dhnr
+TWhUcFzXvJ7+w6MLGrmdl3mAS0mlG+Hlu8TibQyx+ifQseuY7mUnpNq6xcjhI9L7
+VpCmDv0wRdp4F+c5ekHFEMgLzTCqfUuOq0bv7w9yiUdDSwIDAQABoz4wPDAbBgNV
+HREEFDASghBkZW1vLXB1Ymxpc2hlci00MB0GA1UdDgQWBBTXlnH8rQ24B/945INf
+B5C1z+7zIjANBgkqhkiG9w0BAQUFAAOCAQEAVIUtKVwPnycw9dNUOQBLKDnQMcow
+lSs+6hEzp8dHIw++zYDgpcIMoqDsvv1S05bmuJaQ7lmThRWJOl9BewkMhoM4bi0R
+3i/FyuoZ4y6wHACLLxTMxNNSGmGryPACuottWGJsT8P/3sOe3j44hIG97kO5DevW
+171MAfUfK4YVQVHEnuFdAWVl6e45KZYfwbGMjIEiz5rdPY9wAKxojGZxPAHreWGG
+LQbb1fY/gSKB8+aE7wGJ8z0PYSQx2klR5m3dL3uaXRi8qsn8hATqlXLtZe+3SaZZ
+dDjE2u0wTPvH1PGiIKcL9dZV09CRcmR3bTtnI5pg4bcV278uMwRUh04QQg==
+</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://rsc-ra21.mnt.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWAMID</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml b/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
new file mode 100644
index 00000000..b164b1ef
--- /dev/null
+++ b/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://taylor-francis-ra21.mnt.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"/>
+  </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="en">Taylor-Francis</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Taylor Francis Demo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://ra21.org/</mdui:InformationURL>
+      </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://taylor-francis-ra21.mnt.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://taylor-francis-ra21.mnt.se/Shibboleth.sso/Login" index="1"/>
+      <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://taylor-francis-ra21.mnt.se/Shibboleth.sso/Login" index="2"/>
+      <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://taylor-francis-ra21.mnt.se/Shibboleth.sso/Login" index="3"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>demo-publisher-4</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=demo-publisher-4</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJANdb0ljhbfvWMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGRlbW8tcHVibGlzaGVyLTQwHhcNMTkwNDA0MTk1NTE2WhcNMjkwNDAxMTk1
+NTE2WjAbMRkwFwYDVQQDExBkZW1vLXB1Ymxpc2hlci00MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAp+3KHgrr83L1Nu4tz6JX0O+I4qhRVjxZQqJ/otst
+y2SDEdYVi9FFks/jxldYMO2RFB5SyhMAt62SSoBrvlw5S0tK2IadRZQXxeCBulxa
+4mca7YI6BP7cRTA4yPUW7eonl/IohRB2dNCjqqax3iTPivfOi9h85J8Yw1qT0Cpi
+yuvOGanFFd/4SeTUETHqQre5KSRhywoyxPf5B+PAU3qUK0tJccuSHo/oE/m/dhnr
+TWhUcFzXvJ7+w6MLGrmdl3mAS0mlG+Hlu8TibQyx+ifQseuY7mUnpNq6xcjhI9L7
+VpCmDv0wRdp4F+c5ekHFEMgLzTCqfUuOq0bv7w9yiUdDSwIDAQABoz4wPDAbBgNV
+HREEFDASghBkZW1vLXB1Ymxpc2hlci00MB0GA1UdDgQWBBTXlnH8rQ24B/945INf
+B5C1z+7zIjANBgkqhkiG9w0BAQUFAAOCAQEAVIUtKVwPnycw9dNUOQBLKDnQMcow
+lSs+6hEzp8dHIw++zYDgpcIMoqDsvv1S05bmuJaQ7lmThRWJOl9BewkMhoM4bi0R
+3i/FyuoZ4y6wHACLLxTMxNNSGmGryPACuottWGJsT8P/3sOe3j44hIG97kO5DevW
+171MAfUfK4YVQVHEnuFdAWVl6e45KZYfwbGMjIEiz5rdPY9wAKxojGZxPAHreWGG
+LQbb1fY/gSKB8+aE7wGJ8z0PYSQx2klR5m3dL3uaXRi8qsn8hATqlXLtZe+3SaZZ
+dDjE2u0wTPvH1PGiIKcL9dZV09CRcmR3bTtnI5pg4bcV278uMwRUh04QQg==
+</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://taylor-francis-ra21.mnt.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWAMID</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 16084f3f..c87fa1a8 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -621,4 +621,6 @@
   <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fidus-test.skolverket.se-sp.xml"/>
+  <xi:include href="swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3