SWAMID-2594 SWAMID-2595 Updated primulaweb-fu.uadm.uu.se and primulaweb-ft.uadm.uu.se

2 files changed, 142 insertions, 10 deletions

diff --git a/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
index f0b909ac..814cf66d 100644
--- a/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
@@ -25,11 +25,78 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=589118400&amp;l=en</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIJAPZpvDic/HHVMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+          <ds:X509Certificate>MIIFETCCAvmgAwIBAgIJAITUIFns+FrsMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHByaW11bGF3ZWItZnQudWFkbS51dS5zZTAgFw0yMzAxMjUxMDUwNTZaGA8y
+MTIzMDEwMTEwNTA1NlowIzEhMB8GA1UEAxMYcHJpbXVsYXdlYi1mdC51YWRtLnV1
+LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz7BRsK+BF/szKIU3
+aaUgPgGOLWSLIvhgE+Jyf0QJrXtf7GAUUFsp7nkxCQVmoEg1kvhN72f1WN9BJ1Aw
+oukYcHF5x/Nwb/PqN6+J/eR71gaBPiBBudE6g8a9UHzrtrByvl9VeaMac8u3phlL
+0cIvcK9SizUDOvhcSZubmDA0OVDWRWtUybzFMXLZdmkO6L05lEl+aohPKk8EQDil
+X1r3P68bjet/17jhc8JDFdj4YMaSZ9qkw8KJe9PSTrnHii/qGOZKYu560xYW15Vp
+JS68a449HNr1EC9NilWWb75TtYPx4HkEVFlv78SEpz/dd6SIgGzu+OtlA86OM3Io
+UwglKqjJYMdbUqk27kUNIaifNQD4YOmC+FCJ6uxE0v89eMErpHAOk0OUJg60WOSk
+5uYHBp0YcFZOeYtf1vZ8gVOUZQF/VzPYkxi1t+eoYk5jzh69RcLvhZ5CzT/ohn9H
+4ce9BjqkoeAZdava2NvPN/omK+/bwoQzgcpnEWlP97K/ygXnEpzMauQD6XLwqp8j
+XMjendIFe3sRkJ118Q0UN+pIjSO48Z7ezN/hmgw3+GfLM9PQBkhF4QCwUwTg/DDz
+IOPEcRXJD4qiwHFExBAgcBZGtGErCllmy0QXi2ehbUAZ+KgqlVQbT3P0Uuh2PBcD
+s+hINfFcByb4g8Hcw3k10+OQzKUCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHJpbXVs
+YXdlYi1mdC51YWRtLnV1LnNlMB0GA1UdDgQWBBQb/GTRs1fj37I0lp3EgUhGA1LW
+izANBgkqhkiG9w0BAQsFAAOCAgEAkwUp8N0TvN00lwB/PlAFU+06sEa0zvVYGvhw
+SwsvvCwp8EF8sJIxezb9GTJogH7i+GXx7jIv+JHHtXm+58y2/ITX7cE/QGhhVUqI
+GqHMJGaddVzo+G+EqhEFIGoBnbjoMcndGrB9tar5RSDB07myFWDe9j72GKq+Hg+c
+M9UhGl8mnvS0HK/ka7pt0ZnCiBSA+k1cqgMg+Cpf2MswtviGsoN3S13DoHxLdACZ
+vL5lzg8WLNQLzm+3U/I5oqy3LiUQxjnLYxfdQX9CIjOMNk7z05gySTs1TqCsbHLr
+Z1te0fnwgRoMi3YAB8GjhsPyy6OPTv+KHVLIAlY2MQRthSAx3zKlPcdiQYSa05Pb
+/QyknM2cUEVScLYTh2Btz8fOikvIwp4ckq5Bs19q1HcHX8lxJnh4O8YVYIT5xMY7
+LPY0gS/HfWDY0pwCbvAWFTLBTft1AH3p5WPBQBRyx1EJ4C+Sq5XoJUeNbObIGxJ+
+ysvCTA47ouguuJQmfMXPMwN61pBVw5DETCN4eHytBnlTA+FOd/uzg1nQtPoJBzfZ
+uWlkNVtvE74RB3hWz+u2pxbrJ9dh3lpgYlTMUW8wCnvMs50TvjRo0cqAN2WLbmfh
+ChS11VRbxISeQUdupLMBcQlam+KvXF4iRLRdLejhmiwrThZ8ff9o3UMwMXpKxk4p
+znBndWI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFETCCAvmgAwIBAgIJAITUIFns+FrsMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHByaW11bGF3ZWItZnQudWFkbS51dS5zZTAgFw0yMzAxMjUxMDUwNTZaGA8y
+MTIzMDEwMTEwNTA1NlowIzEhMB8GA1UEAxMYcHJpbXVsYXdlYi1mdC51YWRtLnV1
+LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz7BRsK+BF/szKIU3
+aaUgPgGOLWSLIvhgE+Jyf0QJrXtf7GAUUFsp7nkxCQVmoEg1kvhN72f1WN9BJ1Aw
+oukYcHF5x/Nwb/PqN6+J/eR71gaBPiBBudE6g8a9UHzrtrByvl9VeaMac8u3phlL
+0cIvcK9SizUDOvhcSZubmDA0OVDWRWtUybzFMXLZdmkO6L05lEl+aohPKk8EQDil
+X1r3P68bjet/17jhc8JDFdj4YMaSZ9qkw8KJe9PSTrnHii/qGOZKYu560xYW15Vp
+JS68a449HNr1EC9NilWWb75TtYPx4HkEVFlv78SEpz/dd6SIgGzu+OtlA86OM3Io
+UwglKqjJYMdbUqk27kUNIaifNQD4YOmC+FCJ6uxE0v89eMErpHAOk0OUJg60WOSk
+5uYHBp0YcFZOeYtf1vZ8gVOUZQF/VzPYkxi1t+eoYk5jzh69RcLvhZ5CzT/ohn9H
+4ce9BjqkoeAZdava2NvPN/omK+/bwoQzgcpnEWlP97K/ygXnEpzMauQD6XLwqp8j
+XMjendIFe3sRkJ118Q0UN+pIjSO48Z7ezN/hmgw3+GfLM9PQBkhF4QCwUwTg/DDz
+IOPEcRXJD4qiwHFExBAgcBZGtGErCllmy0QXi2ehbUAZ+KgqlVQbT3P0Uuh2PBcD
+s+hINfFcByb4g8Hcw3k10+OQzKUCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHJpbXVs
+YXdlYi1mdC51YWRtLnV1LnNlMB0GA1UdDgQWBBQb/GTRs1fj37I0lp3EgUhGA1LW
+izANBgkqhkiG9w0BAQsFAAOCAgEAkwUp8N0TvN00lwB/PlAFU+06sEa0zvVYGvhw
+SwsvvCwp8EF8sJIxezb9GTJogH7i+GXx7jIv+JHHtXm+58y2/ITX7cE/QGhhVUqI
+GqHMJGaddVzo+G+EqhEFIGoBnbjoMcndGrB9tar5RSDB07myFWDe9j72GKq+Hg+c
+M9UhGl8mnvS0HK/ka7pt0ZnCiBSA+k1cqgMg+Cpf2MswtviGsoN3S13DoHxLdACZ
+vL5lzg8WLNQLzm+3U/I5oqy3LiUQxjnLYxfdQX9CIjOMNk7z05gySTs1TqCsbHLr
+Z1te0fnwgRoMi3YAB8GjhsPyy6OPTv+KHVLIAlY2MQRthSAx3zKlPcdiQYSa05Pb
+/QyknM2cUEVScLYTh2Btz8fOikvIwp4ckq5Bs19q1HcHX8lxJnh4O8YVYIT5xMY7
+LPY0gS/HfWDY0pwCbvAWFTLBTft1AH3p5WPBQBRyx1EJ4C+Sq5XoJUeNbObIGxJ+
+ysvCTA47ouguuJQmfMXPMwN61pBVw5DETCN4eHytBnlTA+FOd/uzg1nQtPoJBzfZ
+uWlkNVtvE74RB3hWz+u2pxbrJ9dh3lpgYlTMUW8wCnvMs50TvjRo0cqAN2WLbmfh
+ChS11VRbxISeQUdupLMBcQlam+KvXF4iRLRdLejhmiwrThZ8ff9o3UMwMXpKxk4p
+znBndWI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAPZpvDic/HHVMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGHByaW11bGF3ZWItZnQudWFkbS51dS5zZTAeFw0xNjAxMTMxMzA3MTdaFw0y
 NjAxMTAxMzA3MTdaMCMxITAfBgNVBAMTGHByaW11bGF3ZWItZnQudWFkbS51dS5z
 ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3AJdiyKqMljln3dJOr
@@ -45,8 +112,7 @@ twYKFqVNI+SF3Rdlrw3C79KCJBY9zgRVbUIXEKtD2hjwzPMPawxuJC9xUKYiLH2Z
 LQQL3w9NE0NN00AImhRenJsL+toQCSybllR1ykNSAFb3pJIf1GRpkRg3Pw2jSvyh
 VbDTJ8rITxjb30BV7SdcIRfaTgDOmXpJRDxB3irFk5DfYV28bFD4VSmRgQxeBccP
 Q9pE7Bfu+MM8CcPiWPcNqE8szbu5XeoaNENU+qp8C/8WGkCMCPIATPflw/NAEr5J
-Mu4KdgUL90mgwqgRfRekVFzBfQ==
-        </ds:X509Certificate>
+Mu4KdgUL90mgwqgRfRekVFzBfQ==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
index f5cfa609..684d86b5 100644
--- a/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
@@ -25,11 +25,78 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=589118400&amp;l=en</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIEDzCCAnegAwIBAgIJALwQAqnygsGAMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+          <ds:X509Certificate>MIIFETCCAvmgAwIBAgIJAPnH4i7Cvl19MA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHByaW11bGF3ZWItZnUudWFkbS51dS5zZTAgFw0yMzAxMjUxMjI0MDRaGA8y
+MTIzMDEwMTEyMjQwNFowIzEhMB8GA1UEAxMYcHJpbXVsYXdlYi1mdS51YWRtLnV1
+LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzAqYlBc7DKRnft8U
+cEtXkqXRAD40LtaMMQjy86fktwHQ3nRsM3gMGp/X+tQtR0o4btUYPh3bX368fIRe
+E+uUnzS6NAq0rihPZSllQypfiiyDHhyd0uqZ9j2UnsFq2VRGaJ7kCVmIxTOqIdOc
+8i7fW620PJDXffJdSxLvrePXn8DnEpsa9G09OVFNpuvcTODsJaYIZYkE2rVUmIIN
+mn9zMQCafV51ABYNt2KDoYm0ienePxMG0XoHtudNIVqi6ubdR9u8IJ7HPeY5s8hG
+02B7NWsZL1qH/XGHUMJm8jMIf2RtUUMl+I5JyySLXJb0HOHM5ihEoWarI1pOZXU8
+7guJ3tjcnXitqenYJLHHRUGIC8onMoy3bU9v750xUnxKf8hF8HaOuDMwUhTOqpYn
+p+9mmh/ve+i4WRky3X2zXpd8fsX/dukN1JCzNfqIA26XqylL+h9YZtfh9hOJon9k
+hArz1oHA53ebNn5TIjU9JFkW9l0TP6xiVjpdmznxkhbh47X9skfMgs+8yVswOQ6v
++aSVpa/buyFsdAxr+VhvmFflX6dbSfocfDRWwTD4ocW1L46RnO3GMDeYqRkFK1FE
+6E0TAnoF9KadpdMh0rqvuxGoCxUOLwdpNh2BnxHN4tAXh9voXh2YUZkQJ7YDHEwh
+rmo+noLB88PiHyEEsVECvBLaShMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHJpbXVs
+YXdlYi1mdS51YWRtLnV1LnNlMB0GA1UdDgQWBBT2QDCJ8BsFLhN41YtvNzCmLpjG
+qDANBgkqhkiG9w0BAQsFAAOCAgEAh/Qgf1Obc/5YrtE7vpNdywJF84xkVMu1zQKt
+OKYpJ5hkjT8n7FXBe5L+0CAS2cDO4NpC9wPZ7xr8oXOrOiekfpv8JSkt6vUGtTQW
+Y9kWI4eix4cS+SOriHY2wcVua0u4OrycidDK9HPKENCcEZGouVh2ocHZrUZP7iQl
+Y+4WWhLRi3cXz/dU79FLwGk3wTlxT0WhhHgRk3kMWp6Mz2MCNlzKrS/d72MFK/U7
+GWhqABzp0SlstZ6SWJRGXGHhDeS94ApLGhxX6PJx+oQ3eVLWRaZ/R8gSfo8JsNN+
+m8nKuGcw0u1GoYYXE04/FZPyGYIg5xvS+gSjQINfEq5ca7/irXlNA3S2LIlHkfZw
+DeyfE9yPLNq8yWCSFQI+zkHZn+1xvu4MwrikdfiKKGESpZbzlqPC1tCurGgcBnm0
+UEOwR8/w6X0/cvUPfUiabqIf3h+Y5oljn3Q8S6AfdtfYO9ZprAZPs9DrGnFMMM6b
+JzkKY25AudLlZp3TKqCWEC5KfsULoWx12BESHpACukGYtwztbRGVGgOZAPxtVflY
+Q+9sOrsNnp4YwNwkVxNUpIjkovDvYHHL90OJXvnverdEY5wbxPVr22ZFSKBERdB/
+em/b6+5GvmPa/qc3JhR5zV0o/PEZGpwqgmJPPTQTPhRg8OnZKkG52hhApW25FEJI
+P9fcYOw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFETCCAvmgAwIBAgIJAPnH4i7Cvl19MA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
+BAMTGHByaW11bGF3ZWItZnUudWFkbS51dS5zZTAgFw0yMzAxMjUxMjI0MDRaGA8y
+MTIzMDEwMTEyMjQwNFowIzEhMB8GA1UEAxMYcHJpbXVsYXdlYi1mdS51YWRtLnV1
+LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzAqYlBc7DKRnft8U
+cEtXkqXRAD40LtaMMQjy86fktwHQ3nRsM3gMGp/X+tQtR0o4btUYPh3bX368fIRe
+E+uUnzS6NAq0rihPZSllQypfiiyDHhyd0uqZ9j2UnsFq2VRGaJ7kCVmIxTOqIdOc
+8i7fW620PJDXffJdSxLvrePXn8DnEpsa9G09OVFNpuvcTODsJaYIZYkE2rVUmIIN
+mn9zMQCafV51ABYNt2KDoYm0ienePxMG0XoHtudNIVqi6ubdR9u8IJ7HPeY5s8hG
+02B7NWsZL1qH/XGHUMJm8jMIf2RtUUMl+I5JyySLXJb0HOHM5ihEoWarI1pOZXU8
+7guJ3tjcnXitqenYJLHHRUGIC8onMoy3bU9v750xUnxKf8hF8HaOuDMwUhTOqpYn
+p+9mmh/ve+i4WRky3X2zXpd8fsX/dukN1JCzNfqIA26XqylL+h9YZtfh9hOJon9k
+hArz1oHA53ebNn5TIjU9JFkW9l0TP6xiVjpdmznxkhbh47X9skfMgs+8yVswOQ6v
++aSVpa/buyFsdAxr+VhvmFflX6dbSfocfDRWwTD4ocW1L46RnO3GMDeYqRkFK1FE
+6E0TAnoF9KadpdMh0rqvuxGoCxUOLwdpNh2BnxHN4tAXh9voXh2YUZkQJ7YDHEwh
+rmo+noLB88PiHyEEsVECvBLaShMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYcHJpbXVs
+YXdlYi1mdS51YWRtLnV1LnNlMB0GA1UdDgQWBBT2QDCJ8BsFLhN41YtvNzCmLpjG
+qDANBgkqhkiG9w0BAQsFAAOCAgEAh/Qgf1Obc/5YrtE7vpNdywJF84xkVMu1zQKt
+OKYpJ5hkjT8n7FXBe5L+0CAS2cDO4NpC9wPZ7xr8oXOrOiekfpv8JSkt6vUGtTQW
+Y9kWI4eix4cS+SOriHY2wcVua0u4OrycidDK9HPKENCcEZGouVh2ocHZrUZP7iQl
+Y+4WWhLRi3cXz/dU79FLwGk3wTlxT0WhhHgRk3kMWp6Mz2MCNlzKrS/d72MFK/U7
+GWhqABzp0SlstZ6SWJRGXGHhDeS94ApLGhxX6PJx+oQ3eVLWRaZ/R8gSfo8JsNN+
+m8nKuGcw0u1GoYYXE04/FZPyGYIg5xvS+gSjQINfEq5ca7/irXlNA3S2LIlHkfZw
+DeyfE9yPLNq8yWCSFQI+zkHZn+1xvu4MwrikdfiKKGESpZbzlqPC1tCurGgcBnm0
+UEOwR8/w6X0/cvUPfUiabqIf3h+Y5oljn3Q8S6AfdtfYO9ZprAZPs9DrGnFMMM6b
+JzkKY25AudLlZp3TKqCWEC5KfsULoWx12BESHpACukGYtwztbRGVGgOZAPxtVflY
+Q+9sOrsNnp4YwNwkVxNUpIjkovDvYHHL90OJXvnverdEY5wbxPVr22ZFSKBERdB/
+em/b6+5GvmPa/qc3JhR5zV0o/PEZGpwqgmJPPTQTPhRg8OnZKkG52hhApW25FEJI
+P9fcYOw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEDzCCAnegAwIBAgIJALwQAqnygsGAMA0GCSqGSIb3DQEBCwUAMCMxITAfBgNV
 BAMTGHByaW11bGF3ZWItZnUudWFkbS51dS5zZTAeFw0xNzAzMjQxNDQwMTJaFw0y
 NzAzMjIxNDQwMTJaMCMxITAfBgNVBAMTGHByaW11bGF3ZWItZnUudWFkbS51dS5z
 ZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMvanZD7BK0uJ/0PM+9C
@@ -50,8 +117,7 @@ PU5t6s68/ysg866j9Mcw3zRWmUVJbYao5blhqyNyfewxekJZOccvY8dcuA0cbqPE
 4AAe/44uIIevcprWkVZjfFNk1ZCH3nFhhRhlcEHiuLvVdsXzBH/Wl4UJaz3G4JgF
 qGGC/0s2Qt0cdUe0bNX0XIgVev01w53Z+n4mpsiyobRApgvAp5hGLSAY3mt9vxUz
 NjUy+4nsmbSqctyZxay94bph4JBpvzNCpt17yg/zdcsc8xsnBdLl5IrNEUSVWr6J
-O5RRhRrqQ+FqWofyuV1dizmnxKVpfkF+9A1ro8WlITlzhxU=
-        </ds:X509Certificate>
+O5RRhRrqQ+FqWofyuV1dizmnxKVpfkF+9A1ro8WlITlzhxU=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>