3 files changed, 52 insertions, 54 deletions
diff --git a/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml b/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
index a6efcde4..7454848b 100644
--- a/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
@@ -33,25 +33,24 @@
     </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>
+MIIC9DCCAdygAwIBAgIJAPb8y+C7NO7YMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2Fjcy1yYTIxLm1udC5zZTAeFw0xOTA0MDcxNTE3MjBaFw0yOTA0MDQxNTE3
+MjBaMBoxGDAWBgNVBAMTD2Fjcy1yYTIxLm1udC5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAOzAOXbXzkXaOROKhQM+luFsAvM+wBz6JRH1E2ASL6VL
+JJjdWG6HqVogKWDtmt0Ckfhe+Ir/EuIdZnNJAGrM5xY3FlF/PdfZRQlulF+5YVrH
+6nb0HvMrW+ho2fCka/AEMDt6LSPCmZOpSOP2+dGA71/FJ8AfMxY1OWW51Mb5WlFN
+L7vHiUD+c5WIRvfTuFKbhEcvOo4bmGbdtbPvenc4RmQjbbTdEL1oWnvwqOmMjgmh
+WGCkI53e+l7y0HR9zmHU6aH4hA/6KqeKfIrNDFFAPW41mKE41tCd2iTfwh9j/zmQ
+1gBiM2UXAuskXhn355MmNugoGmxWuljM+GY2TDqaiWECAwEAAaM9MDswGgYDVR0R
+BBMwEYIPYWNzLXJhMjEubW50LnNlMB0GA1UdDgQWBBQkXxAbFKdn3OGY5yebbfrY
+9qP8njANBgkqhkiG9w0BAQUFAAOCAQEAYAJAwqhmraSSpHq9PDji9FR8PzCoNGkc
+jp5dgp+XNT06QSi74O1Isunoj9JGw94U9H1Q51p+m6IQeISJ2YMZQQ8XCo75Hfyp
+ZW+tn7jLSUG4sib7AlnhiS2WuwSh77uhblWdZjqPdjDTi4xVN9zLk/kJyRRSe3jt
+ieQmGMRlDjr7hTsk2fzaBakqeopccdpl89y2PCP1BQvbN1I4XV4Je++poRcLTKUS
+LAEmNeaWhO8ldUPbBtguYA7QBBgxv6sz3iOnBYhSbND6hPZeMC4nv9jpleD1UNJS
+LfzIVIx1AEnE4NLSJyoJgzDiq8xvKC04IIyrZNaVPn8+00UMkZ8Jyg==
 </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
index bd30631a..9e4920a0 100644
--- a/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
@@ -31,25 +31,24 @@
     </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>
+MIIC9DCCAdygAwIBAgIJAKrWgX9TpWBbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD3JzYy1yYTIxLm1udC5zZTAeFw0xOTA0MDcxNTE2NDhaFw0yOTA0MDQxNTE2
+NDhaMBoxGDAWBgNVBAMTD3JzYy1yYTIxLm1udC5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAM+H873S6h2axCK5XadhDD9QZmxlJQEVMIn14TgfWQkj
+tPxfoMKprcU7+Y9oBbOr49d0smMQb6VuMFwKI9dP636rmhgiAuFwE7QdQ+XLJMbq
+dLt+MSCdwOn9N4PVLoSp+ZDBcUVch98BPq5gW33oohIR/pI37f3XMWYpxajER1w0
+qLL3J7wHHsP656+sV9n2Ss/Mvuz0xzhcO4CJ8s3rFxY23fgrXpwvoXYYxLficGPD
+H3cBiUMW6+Kuj/KvS3YFLryCtKA9w7JHiZXMpCfnaZbB47MNmPO2ElX6TgbsBDx2
+ELGOjEBqLsDLPrGkTuM2me3b8fKxnrsyD2LjUpfUDSsCAwEAAaM9MDswGgYDVR0R
+BBMwEYIPcnNjLXJhMjEubW50LnNlMB0GA1UdDgQWBBR2bxjWRCD8ZVhf1V3V8nSQ
+sxrdqzANBgkqhkiG9w0BAQUFAAOCAQEAwTSQcA5gTRkH0gTjs38/18IEXwGThneL
+gaJKZ2cMPMskNtqq5oqZgZ38WRdfviPme/U+GtnZVG+nqcrhwVGMDxVwC7Qewoic
+DFp39oLAwc7RsbZVmadupfu/3+zh8vcdvHyDfUC3n7mp6fkD2+MsHlQn+30jOR4E
+6YTLa11JIQp0/Ild6y4kMFHuFIJCXTZ67lb0t+s753pLBTWA6mYF4oJkKZ66TJm3
+nXVZcr7zliBf7hM4niRuAjJMbOx8Ctt3e/d9/Ip2E1FML3sM90qUMxv0DMnsaOaG
+N9+dhbsHlWxxqoORNNMbe/1NBn7pKQIO3YhMs/XynxTRrRpS5ayjAQ==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml b/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
index b164b1ef..63c99946 100644
--- a/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
@@ -32,25 +32,25 @@
     </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>
+MIIDFTCCAf2gAwIBAgIJAMqHb0a8ChXEMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+BAMTGnRheWxvci1mcmFuY2lzLXJhMjEubW50LnNlMB4XDTE5MDQwNzE1MTc1M1oX
+DTI5MDQwNDE1MTc1M1owJTEjMCEGA1UEAxMadGF5bG9yLWZyYW5jaXMtcmEyMS5t
+bnQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDg50srcQeGodZ5
+fJkxit7UbpxWrTNXGm2Q7uhTargwh64Iz421aWWajgSzclcgmWjabpo9X2+cHyMJ
+zGB1cOQs1l4dO5mUKE8KWfuw+Xgp/XY+nf8o6i3nVIdNicDinDkYN2ljoGKiCwJK
+L4C3mnnk5FgFAYZINmygTvz92PnSUZrAhBL+hsOeJUDm3VY5jJbsB7DuDBIuBya/
+UD90PDYjkLkFd2rtFOD+AOnPerFtviabs+4nn0/M2Jo9OGYMajfWk+FAPOoUQfIb
+8crwBsDo7LefvKA8Eu1oRYcWKynEYWls4uxTtm1OabQfQ7XMM+ZvG6T/vHnwc+Wp
+KqCqlM3RAgMBAAGjSDBGMCUGA1UdEQQeMByCGnRheWxvci1mcmFuY2lzLXJhMjEu
+bW50LnNlMB0GA1UdDgQWBBQcM/yBTCESWtm6iihy3mRnk9tUczANBgkqhkiG9w0B
+AQUFAAOCAQEAjPOUDXnt+ClPY8nvqqs72fi3hRtIFDdrJxmRofnaBNj/WpSz4wVs
+htjV7XpzTlaB30Pynzx1MBLT0A7kdAMZ/qWUeWc685krOsFPX+glQQ+fdCehr6UN
+o3DPF9La+f+F//8i8esnbm92h324wxBZe/3tnb+xDUeB/u/4CpYaz1dWReRpZ3GK
+3averYb8d2/xpEYGeSUvAwNpKidPrpp9dM7XKlfsXy8ZaaAVE/kj6s2eQebKO/Al
+C/XubcCZxfY5gS02KI9MDN40PB2BqM122BK4LkZLthoSByLf36YkrxeG3QwzeLy2
+meJi/RmkoeATtUB3uah+Xax+Nx0Jil2AYw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>