From bc1f9381058a6d2f908d4d5aa9e26b7cb90b5c42 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Thu, 19 Nov 2020 19:33:15 +0100
Subject: Part1:2 of SWAMID-3538

---
 swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml b/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
index 2e5ea64f..962bc87a 100644
--- a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
+++ b/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
@@ -85,9 +85,11 @@ hMVy+ILnwh69da4fmqSFeR6a6+dYZc/WVpbU8KwNuIsmqkZij4YarwDS1yXRdEMh
       <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:KeyDescriptor use="encryption">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
+        <ds:KeyName>administrationsverktyg.umu.se</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=administrationsverktyg.umu.se,OU=ITS,O=ITS,L=Umea,ST=vasterbotten,C=SE</ds:X509SubjectName>
           <ds:X509Certificate>MIIEEDCCAvigAwIBAgIJAJ5qWBv+yDyJMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
 VQQGEwJTRTEVMBMGA1UECAwMdmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
 CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEmMCQGA1UEAwwdYWRtaW5pc3RyYXRp
@@ -109,9 +111,19 @@ Oq4NlNQH1Fs3P0ES17SVInRjaddoqHiR82iWK344s+0CmtXkzaGroY0fJZYLsbT2
 pVLlobMIW5yldLZ8dsHsa2fohiSZQYEcXBZWTDtVJgyYkI1NeOSEDj2a/Ya2iir0
 Y2/hyVjyv3DnhZLvmxvkEggPlmHa8AM7ibD3JaSjwTryNq97jbpee06CZLX3dpMl
 QDgQlUkWR6i9EfPex0bGo7WnA1/mffmKNdhRW+MMNoYAlGBj3rIXzBFmhO813wsv
-rnr4gDQ+JdRcPUyn4+9DPcsnABhy+LtA3mmXyFBJ2jetFqPJ</ds:X509Certificate>
+rnr4gDQ+JdRcPUyn4+9DPcsnABhy+LtA3mmXyFBJ2jetFqPJ
+</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://administrationsverktyg.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SLO/Artifact"/>
-- 
cgit v1.2.3