1 files changed, 38 insertions, 19 deletions
diff --git a/swamid-2.0/visp.humlab.umu.se.xml b/swamid-2.0/visp.humlab.umu.se.xml
index 443c8950..13b0e422 100644
--- a/swamid-2.0/visp.humlab.umu.se.xml
+++ b/swamid-2.0/visp.humlab.umu.se.xml
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://visp.humlab.umu.se">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-20T15:11:37Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
+    <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: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/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-20T15:11:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://visp.humlab.umu.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://visp.humlab.umu.se/Shibboleth.sso/DS/Login" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Visual Speech</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Visual Speech</mdui:DisplayName>
@@ -25,32 +41,35 @@
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>0PQfnivR2RVYiqXlu8CrQK1BtYByPOxvgQrAS_JIsfk</ds:KeyName>
+        <ds:KeyName>visp</ds:KeyName>
         <ds:X509Data>
-          <ds:X509Certificate>MIIElzCCAn8CBgF5iZbj7TANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR2aXNwMB4XDTIxMDUyMDExNDIxN1oXDTMxMDUyMDExNDM1N1owDzENMAsGA1UEAwwEdmlzcDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJXmCrgRn/oFlK5cc4GXIktviAohU3REKmgoMCwIt90iH0b7y7LVQHn+18cVCN5uzpB6wDYQ8kjKWvn3VMH6Ytep4pdUoPbntJH6cqU5hSVY/AQ98u98FwfK8glHPTR8lRikcD2hfFsmwfHwAMVpiYBbYE15YnZpVZpaEI98cP6bEy4iJ4ya+LkKbrXZZUHtoOD4QXGeIfGGMlnBZ9Vc4DvtQbRdpunIeg02T0WcNrJ6l463DPn+qbzo1u/e8MrnXvLEw8z7rAH9/BzrgOWfedwgYkSdwMsFyRvDP+XAaOxdglQmlb9jiHf/vNUN6fPOFhtASyfpq1gyZpdjBFWztm1O1adHdx2wpCW++pnsslBD3a45/ovI5djQQcJtu+syTaZl+ewAE6l8v27F25LvfE0N4s9z3E4XS+PGapzR3RKD/WGSIb1UnihG09WpnFVFmAXwiPiP9nxQ3XOrdAmr7XXit0EBBKOjUDOOwzgBOyzHWU1Btiw1a9Xsekd9qrjS28VXqwG9THxzFGutOpHyrFu0MpmJsKH7LV2xrgkFQDKYOCNp1pjGrPHk4Xc8/7Us27X6jWo6PV15VAzJKtbMieUUZUKxepXSPcWfENHB8Uj725Hl6I+cnmTEJomrbJucSKKAqFLvDrxGQbYdco7XZXGwApKM9/votNcFOxFdGa0vAgMBAAEwDQYJKoZIhvcNAQELBQADggIBABw3owbhcCqmUeQODM7+e4u+lrCc0T3etBFdyjFqFsiI4v7RMpllKWldX/4JyQ1bRgVfdokKPTnDhL6sJyBJYyCvlCeiC4xa5xbm3Ui0AjodITNX9DzNmYIMi67RmQ39SmoC0/D0HsMRe/ybfpreoQhF15xQK+LG+BJ1kwgTyB655oE/1Bx/+y0kS3sGG/LeDomQ6PXEZoerftKeWDMwVWadBdngX6x50FOVJFDeJaDM5l3tfXG7OEyRKBYkK/Z+QT5caLGmFFKHaUzSIwhcwHOEsFAux76omD37k3twkSlRIC1ZoS80yRDxYsMi6E/Fgy06BRKFpaDbniNMwN6l6DqzAPGK6wFjkoBbjbyWnUDPuEls7RrTVT/VBtlFOMmILIdM1uXgVgMLXmqwcuFiYdYWC4i7WTJh2mQSQMnwg9S7hhdCGmLZH4hmFegIx/1siM2Ce5WUK9nG5jsfhfOS1hIt8EKruCDv+yrWcgn+NiPA5y5q+o8JeY3CDSKM/Al8bOr7TxNNkiwPKpsizHBFmDvIt8de+SCgwVSBsgpGd/XKol0LvMeI1nifs4DMxrdXPXBGpjoEGE95EO5l6T+ch/UpZTFacV+ICfEwPYr/9B3c96tqhaA1cY36/7KUxD59NkUnyRXpnZcpQ3nBSYFNKLuijbCkMvbSfQUqY4hDfFxA</ds:X509Certificate>
+          <ds:X509Certificate>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</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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.visp.humlab.umu.se/auth/realms/visp/broker/Umu-id/endpoint"/>
     <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://idp.visp.humlab.umu.se/auth/realms/visp/broker/Umu-id/endpoint" isDefault="true" index="1"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="en">Required attributes</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Obligatoriska attribut</md:ServiceName>
-      <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="false"/>
-    </md:AttributeConsumingService>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://visp.humlab.umu.se/Shibboleth.sso/SAML2/POST" isDefault="true" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Umeå University</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umeå university</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://umu.se</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Umeå university</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.umu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.umu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan von Boer</md:GivenName>
-    <md:EmailAddress>mailto:johan.von.boer@umu.se</md:EmailAddress>
+    <md:GivenName>Humlab Support</md:GivenName>
+    <md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Humlab Support</md:GivenName>