1 files changed, 92 insertions, 64 deletions
diff --git a/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml b/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml
index 8e649028..97c76aae 100644
--- a/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml
+++ b/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml
@@ -22,9 +22,7 @@
     <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:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -38,82 +36,82 @@
         <mdui:DisplayName xml:lang="sv">Högskolan Väst kontoaktivering och lösenordsåterställning</mdui:DisplayName>
         <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account. You can also use this service to reset your password for your user account after the account activation.</mdui:Description>
         <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid högskolan ska kunna aktivera ditt användarkonto vid universitetet. Om du redan har ett aktivt konto kan du sätta nytt lösenord om du glömt bort det.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="50" width="50">http://www.hv.se/Media/Get/17595/svensk-logotyp-200x103</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">http://www.hv.se/Media/Get/17597/3.-engelsk-logga.jpg</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://mittkonto.hv.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://mittkonto.hv.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="103" width="200">https://logo.hv.se/logo-en.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="103" width="200">https://logo.hv.se/logo-sv.jpg</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.hv.se/en/om-webbplatsen/general-data-protection-regulation-gdpr/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hv.se/om-webbplatsen/integritetspolicy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>w16token02.wad.hv.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=w16token02.wad.hv.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDjCCAnagAwIBAgIUAmeIyTNRvqavMyNVlZbUKrFfB90wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAxMUdzE2dG9rZW4wMi53YWQuaHYuc2UwHhcNMTkwMjEzMTQ1
-NjI1WhcNMjkwMjEwMTQ1NjI1WjAfMR0wGwYDVQQDExR3MTZ0b2tlbjAyLndhZC5o
-di5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALS/s8u7vAvqTL4g
-irOc7Z4iVws/kFAUCL2cdq3VELvZDw86XuWeQlBLSf/ZNb/pZDX/osuzdNnn7NVR
-0+srV0Fg3BoD+EiJpATWqEXv5gvwEigpZWFyTxERkpptZVJvjI4ySuC7mtPjcf53
-0tD190G9kS60p+ayw5M/EokxE+d6DcdvA+ETY1Zbpv0YZ6Akn1yFtOhYt+6anfzI
-g5TgK6XfyUZpI7gc/jivt2ZLi6KZCMCRFQw/m9ljg2jBVNBNlsT4+4oXA2a2S9l3
-qO53fk0cOyYcU6xFqxcyYxm0VHqKmZTi8GlpN/XHgVQyCY+wApROSlHZpUuPC1FV
-7JP1WKKb94UI21I7CRQi7N+Id0Q2GS1pogDjNqTb/s35JOgOjgMnTayPAF1dA9qa
-ywM4LlsAi7Ptg0MNYb/78sv7C4YpNs8y5u62bKsW6P9B2maJfi5H/ZSaYmmdijvp
-SyGqJ1J35FhHIyB0GjLeI/1XxLMYX32OrGi9gOiSji+S8C1BlQIDAQABo0IwQDAf
-BgNVHREEGDAWghR3MTZ0b2tlbjAyLndhZC5odi5zZTAdBgNVHQ4EFgQUT8NZwmbh
-rgZxQe44pg7ChKLXSX4wDQYJKoZIhvcNAQELBQADggGBAA3J09Z58KzBxYKmMB7T
-abRUfVgsINHO7bYOydBVDUPgXjEAGK+Cu0wuwTnTLWIEKipyYbYPuXrTY4X4Emx/
-3C+dVHKSNSGktH2sgX/tISvmjAwgXc9hqJLYCFgSoWOPB4cPXTAcnRQDK2HoBegY
-bi5InMZI3lf6wmsojZPR24acC9zrzDRDH1OsPNzzk+8OcT3Qmksa5jeupwCfuCfL
-OMscHRHK72x0ZR2Az22v8/i7JpkNLzy91q74z1oKCjevr0wsWB6pyNT/XQteuTSs
-4hduNux0ReRpuJ63Q5CBcKlrqThVwGNhxXPofBQ2dxQyP5wX0Zj7i1XO6WiOFr5o
-HpVGbRG7dQZOopj/kV2SoP3fAvAUY5pb0I/0QCbCJiaIvljndQDwRTVkgbF8pQzv
-owPw8kGjqmO270eaenW+aaFaoba+daV/dR9BIItpU2P3vxrnRHgBT9Y0t1Lsa7ZM
-g5I8h80BOYvVWyllh9NSIkb+NHv3b/lsecOXQq2CbLaBBw==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIUAbCmzY7utqzTzsWYDGejXw6kQr0wDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAxMUdzE2dG9rZW4wMi53YWQuaHYuc2UwHhcNMjIxMTA3MTEz
+MDE1WhcNMzIxMTA0MTEzMDE1WjAfMR0wGwYDVQQDExR3MTZ0b2tlbjAyLndhZC5o
+di5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMpfYiEhSaYLCqdT
+jNBruoak+oTyqPShX6azR+lar/BxiRE0UyvieHT7t61DsMx2PkLeEhcIRxymsqp9
+KbLxUpLZ3F7Sli07zEj19nsBMLk1FvPQz1EZuxLRV+w3dUBhIapbE3fJ0Reuj3xC
+nAdw+M6LgtE92/wlUNPx9I/qyO8oHk32BozZwUg2ax9Pz3FyqtlUA8X4VUP5FkMq
+O0UkcJE068S0tGtnI2/JFR8TsJCWKWbrP358Z6y/Vx6iY63UbZy1YSxq2Z+/ASrP
+jzV4UmJWfX5iHlyh1kPRjaT+OLJXBcBriZi292b6Jk+fCrtf0jzZrHsaJrPlCyql
+4q6JeaWFz1oHKDN4oOUnjiNV6s1TLEM8u6UCE5BNycZ4bQSxE9PeI7HE4Rqk8q3H
+cAtvZoBvobD63lBksar7pt6GxYnlKh00BWhTB4/edTEnBGPcaW/RB7fFveeBK2wH
+akRkExtuJz2GOkKqrx2rqvYt2eSclnMoPMvGXf7pzUXkhdZpKBIX/huj8UseoTcw
+NjXWCMQGT9Vwm+BmDDtlmfCbwuKxJ6mSD5oIpBTPIciKdZOwDJFrm0Jccc2JGkCh
+zhPzH0nAfWbpcs0PqkVw+wTRxbokcqKBs5YSXJHuhtOjqXA97XcHZOeiC/hH7jBL
+kLCKsI8EAxPIUPkSjR3GL1rer2JtAgMBAAGjQjBAMB8GA1UdEQQYMBaCFHcxNnRv
+a2VuMDIud2FkLmh2LnNlMB0GA1UdDgQWBBQofL6A+x8aI/iEhqS0KuNV3yQCTTAN
+BgkqhkiG9w0BAQsFAAOCAgEALdvXnS0hwr8HJflCdgHKW+m/T6lsG0D2AY5ZzcS8
+jpi+ulytPssLZX3PzJv2zGFc7BXkRb5x4phFhjXCQDQMPnP8gwLZwLGXQ1RfeWSh
+kwFX270G6Mp4bZqsuhAiXf3aaD6vMNY2iXYnzJ1wSqPQgN44N4MkHBhoLxWu7RpW
+XeBY9YVrapIoStI8KDzoT8p3uGtKHrDcuT0VlFkNeYjIY3U47Fylt0mvPi09gdT/
+WJkC2F7ikwRVtFD4Hz9JYgxV9r7dX967byBFQPaHLYO/u+WO/xqvOcukbaH1Rx7y
+e/HF3tzuNttvtqyhZCTXnLfpUZCh3yHKxaiK9Ze/nRx8PqWF87orvvCrV4VBycCo
+8oaebzUQV5QOd0rNzRpCbvGF/JgrIWoKY4JCbW4vYL0hafiZB3xPE998KUMzFj/X
+yAOpUgH4BfJr82C6jYBlylE7l5gFdk8HmTpEhNrCiG2L/sil1AZ8icsDN5lQRI0d
+uaTASiVqaJa6s+zH3tNcwizQrtTf+utQceCwSryP8xRruDgpATPDA8U5CFJPONy2
+Tmk+uL00zA+WX/prnHnwXrdt3lbkeie2JdEAeRRwZdFqc31U/j/DJWFMkOfNTecj
+6MG6H/vuAzSDcG5xFxP+2z0ETALFDXnPKCc8amoVNILFrTUmWhHSRLKQgEUsf6zY
+dqg=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>w16token02.wad.hv.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=w16token02.wad.hv.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEDjCCAnagAwIBAgIUBCS3GEOGF97bytZorcjltgkB630wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAxMUdzE2dG9rZW4wMi53YWQuaHYuc2UwHhcNMTkwMjEzMTQ1
-NjIzWhcNMjkwMjEwMTQ1NjIzWjAfMR0wGwYDVQQDExR3MTZ0b2tlbjAyLndhZC5o
-di5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALjpVfhy2ZotGen4
-WtTq+8IPd/+0teGHooZVpXjk4lZp/QsnLtmD4131Fn1OS/okGFqQE8PR05XefBQC
-vYAP5DNwhVnyXHdjQtOZbaI2G9yhnFu34360+tmxmHoMOEmGFPbfrvzA737+ZQ8t
-u/D3lBdjY0xT+5PNYal4o+k0xFmgq0lFTt/b+rn/bbRcbSheNcLIXtwgLQu06oZ9
-/kClQmTGCjks5R1vayxay5QTw67KArZXk7h44JOdIp/AnvFvzbfsjXHx2LA3cwaF
-BxS42SI6ZEPMpLZKCYptQmZnNvj6vxJjYrG8A7m8neqG1c8DxyST2AinMFjEbyH3
-CYS7e/moYrhS7c4gGgaQIIWXe8nmnOdaORmoBWwHLhThH6N+Mv+v6VTtnN41fCGt
-3uu3e9CFahAdrIwfkbZXulU4iO3UEcheW6mk6NTrpMiVeXMALlqE7rRGj91pAUie
-iT3lRdfOd4AUWDzuGjWAT3sG1aNOgVe3fB8CCQqyMxqeSj4pvQIDAQABo0IwQDAf
-BgNVHREEGDAWghR3MTZ0b2tlbjAyLndhZC5odi5zZTAdBgNVHQ4EFgQU6oEGJvHe
-56gtvDV7wj6Wal2GEfMwDQYJKoZIhvcNAQELBQADggGBAJYkx7Ur7t42snrSfprX
-YaumK4KT8GyXfycREfHmElS9xLThNGkqr2ALTr645/5Fn7tbJNHB7GSdyKBDHEZa
-DzNZRWw+ND+uM7MrqN3STOcVY2e0HfSpNMSDeNkyic6kTAKDWBZXib6RMaX3/of3
-7wnHMpE6T+oFOCg94UGNYtctjAJZzZl59o3o75anylR7o+aXwvunfT/vq7sZK2IH
-GGhn1nj3i76lRljyMKFVp9As1vzLGUd8MCCnwlimvKUOWVTFVXeyLTJ6fgMi5DTJ
-xFs6d/pbv8ZpfBrcVzg8A/TXtznNT2PL7VW8vEPmse8mPQrnsRQDij23mVwkgJXq
-2akFd/ElCXI9x0lb7Df0T8N4+NB1i6vCmdhDQSgjV4NSvsW/cJCvvGVl+ff7weT4
-z6+7PZ+5rd/cobHS16LmJC+dsgpuPCY6r8+HuI3nGezZYDAhKjfOR/6Ikno8/eEW
-kAVNeiHld7cgAfvBDN59cQlSlpraBCjnkV8WAMXDcFJ/7A==
+          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIUUUvqGUsHkGigrrqlXPwNr3or46MwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAxMUdzE2dG9rZW4wMi53YWQuaHYuc2UwHhcNMjIxMTA3MTEz
+MDAzWhcNMzIxMTA0MTEzMDAzWjAfMR0wGwYDVQQDExR3MTZ0b2tlbjAyLndhZC5o
+di5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKkfa/BSNs9QhLja
+iF7I6u+VI/ox5XCjYhySvpORost8GE44yaVKAhHkSJL2NaFNTTM9fDrkmRxY2qtc
+PMXiWAAJl8Gyl7At5Yp0ItC0GdX3nSehtwF1+9qLtw9qm7yMJNv+APTjbwc6DEC3
+/50DCDXBz9MvLfyXEawaB8+ZZ8iZKGr7EdR7PhY/mgY6TD6kk1rN0l8RvIcWm+wB
+CWkG5/ai416c8ORh7g4MTVzsar65Pid5k/lUyAQ7mGLCLxo/7z1eZ6hUHyugQhPt
+Wtko+ZVZ5NJCWhIwfaERzw4yinVmLPZY/huob82IZhUfIsZI/j8zZZhVpPK2TcXS
+XH79DzuswHTFnrTxVis7NSpgNBMLyJAZG44QHsj99sT79EsYHEyYoHpO+biH60Os
+27jJaVXsN5MAiFSol4qW7RsCqpcgyfa4u/30UEJ8rJrcxEeamIZIQv9S8Z1qhOLL
+xLAqnELtqAeWXsnXfYTKJDxkQrC/6BBZ1LcbyaL09A9M4X8SwpzG3f96TMLRwXoT
+/q7PYs7dp233LPPGm6x8KtSh+b5m2w3TWxfpy9VQ8dKsr/fTNIYznbmzibKSEh2h
+H9vGabQyB0j4eHTh+1Oqg0g95PLQKy3cyoNNxmyjfe63AWI9w9kH7pKk0lL3k6AG
+gHmZ7RKO9jZkVAVHSNcu1IwNLqmtAgMBAAGjQjBAMB8GA1UdEQQYMBaCFHcxNnRv
+a2VuMDIud2FkLmh2LnNlMB0GA1UdDgQWBBRTTEQNR2uj6+KuMpnkI6po0KYXsDAN
+BgkqhkiG9w0BAQsFAAOCAgEAANN0UlerjXbFDOnSM4ruPwr7LqAhubtdtXB4kq9T
+teBezFoWKN6RTz+p8BCHdu2brCmc3M2DbKUhY2mHsZZVZi5Bb9ZdnnaKmRtFvIdZ
+ZGPVXgASUSdbcBsuOSMdOgQLOOPI5gljbsD70iQJYcT1b6Yz+6/5j0h3EPLoSxSk
+WjyxR+DrZWkJ6IWyKKIHxmVBP9dpb6A7gneg4cumVlaE4yBnPpbTSIgBdG8zrIeT
+pnqiMeyLtuoWtjd2u57XnyU4fv9U5azYcikSIvKPitR+xnWmZ1H1zBx067DEbO/Q
+Y1lxfbcRDaaq4z3PNwepRk1XF06hvZV768voqOSfFuUecedaMNeD+FMtqi+tWbOx
+S/iOHZvDtSiOxw3GTD1Xuvp9d3cPWjpvkrBp3IFVotm+6iIH/uAyZ8OjOAhIz1Fo
+9bFYItan3eYMJdrKD5tN0SthcA460++z+/oguUaIai5FxF9lG4LKqV9zVSDWs7vR
+2z7I5Xwy3KJhyIrzIQmJp+GGAPaG9OXVMsIOi3M3q3+5rkHkx45wGMzVUOaGAwAH
+z7p9V9QoHNQXMAI+x5B8JHDXvuCEZ7f7oYuhERo1HfltDhFNkoB/+x1P2QxSDvKM
+4E7UmnCPp6qpMhN582OlQhTgb5PMKajtVXXSG1LJH3BrHMzuwb0d117plDiCD+LZ
+VBg=
 </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://nyainloggning-test.hv.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyainloggning-test.hv.se/Shibboleth.sso/SLO/Artifact"/>
@@ -124,8 +122,38 @@ kAVNeiHld7cgAfvBDN59cQlSlpraBCjnkV8WAMXDcFJ/7A==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyainloggning-test.hv.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyainloggning-test.hv.se/Shibboleth.sso/SAML2/POST" index="5"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University West</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan Väst</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.hv.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.hv.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:SurName>Christian Jiresjö</md:SurName>
+    <md:Company>University West</md:Company>
+    <md:GivenName>Christian</md:GivenName>
+    <md:SurName>Jiresjö</md:SurName>
     <md:EmailAddress>mailto:christian.jiresjo@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University West</md:Company>
+    <md:GivenName>Magnus</md:GivenName>
+    <md:SurName>Andersson</md:SurName>
+    <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University West</md:Company>
+    <md:SurName>Servicedesk Högskolan Väst</md:SurName>
+    <md:EmailAddress>mailto:servicecenter@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>University West</md:Company>
+    <md:GivenName>Incident Response Team</md:GivenName>
+    <md:SurName>IRT</md:SurName>
+    <md:EmailAddress>mailto:irt@hv.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>