From b7457ebf35dfb59f703725e2addf2a8e575edda6 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Tue, 29 Nov 2022 15:06:02 +0100
Subject: SWAMID-2082: Updated mdu-nav.cnaas.sunet.se

---
 swamid-2.0/mdu-nav.cnaas.sunet.se.xml | 65 +++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/swamid-2.0/mdu-nav.cnaas.sunet.se.xml b/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
index 98ac4187..f780d4cd 100644
--- a/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
+++ b/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
@@ -20,6 +20,7 @@
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-03-03T08:15:35Z">
@@ -33,7 +34,7 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">CnaaS MDU NAV</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CnaaS MDU NAV</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på MDU.</mdui:Description>
+        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på MDU</mdui:Description>
         <mdui:Description xml:lang="en">Network monitoring system for CnaaS at MDU.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://nav.uninett.no</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://nav.uninett.no</mdui:InformationURL>
@@ -46,30 +47,34 @@
         <ds:KeyName>https://mdu-nav.cnaas.sunet.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=https://mdu-nav.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELDCCApSgAwIBAgIUAfcVTRChOX+ilOvp9bCBtFtigMUwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIFLDCCAxSgAwIBAgIUOowLHafDMzMzwfr46PL8fysuqW8wDQYJKoZIhvcNAQEL
 BQAwKTEnMCUGA1UEAxMeaHR0cHM6Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMB4X
-DTIyMDMwMjE2MDgxNloXDTMyMDIyODE2MDgxNlowKTEnMCUGA1UEAxMeaHR0cHM6
-Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A
-MIIBigKCAYEAzNlAkGch3YE9t6YgACkRlIQK5XrW11lr1e9Fkuz8K/+uF3eFWOsy
-P7aDLpCUqLu5Bvc4vb6/AxnWbyTv549BMqKfC1LhHs2cTmL/QYNUfd6qtayPBhxt
-e6PZpZ6qrnRCLOi8VDqYuZ49hK82FEMBHG2GqlA6gdjqrI2jbTWbTjVivxuPivFN
-wgxRmXA7Vzp+YlAtaEQgN9TYqTe/CV3tsutukjnvoIO9rNjiFwDgNNqiXsF/ZcIP
-7UquEAyQumOewd/L12HKxV5Iyz1kTfOEE3E+C8qtcSq2NVq3YZ98/mEKsQBjyJnF
-agbT1R84QAa4ctoaGBbvQORzqltX6TSVLfCkaGXmvDbHFh5EnqpYzsoJI+oNcmUw
-wIAejtyJilVruJizdrnJ9ojHxj55f5C+H7rLCOA7At3J/tvJ5hjFjHW5KjgohAvf
-yh1fnmKk6Z0//ZbjeW/A8QEzSjjGyjI5mfVI921aeGbMO5aOvozrLl2IRyoxIxAN
-QJ1CMKiLcGBZAgMBAAGjTDBKMCkGA1UdEQQiMCCCHmh0dHBzOi8vbWR1LW5hdi5j
-bmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQULek3qAksB+FrGYHPTEcktymYlj8wDQYJ
-KoZIhvcNAQELBQADggGBAFlS9yTd8/DHwPuRuIqZM72j8UCZjBOPgZ4qzNNjhz0Z
-iIpnn2+/Jc1e3goKv0BHd4Qr6r3wCIvzeQd+pJdtuHzbASttVY6tW3UYjb7yE7gw
-0L68YwnXFD4NIpo8dM+Tloua8ZhzpaCnxVjLZym5NkZqw+v9wx6j6Ehb5iOjRI/D
-sYXLi+M5B6pmthH15XXMSOGdFCvdW70z2WsH983KR9+4nXMsILZSHP33fdCmrWJp
-JPb71/W7KVq1vP5xFqGLAoNHZIDO8F+y5EdCxA5oRrfcQWLvquaSk88A/Aaw3m0Z
-AgePVmVPe3f9c0Ep1IhucbAc5FNeT1kJrYF7sKrM5/5rBFnoaKJ00UCsw+3s9Ix9
-avwKQDDizncyFDzGdNeJq0vsaBtTZKIQMil5u+KtE/LuHIp1LRIM+VtQqLXFgcWb
-wBqgQXRVl/CavUgz/wwCddpSpVOnccw82Qdi9fX363zpfm3hORKdMY/DBUcsrUSj
-V/ml76bFEofGNdbAHcbMsA==
-</ds:X509Certificate>
+DTIyMTExMTA5MTYwNFoXDTMyMTEwODA5MTYwNFowKTEnMCUGA1UEAxMeaHR0cHM6
+Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAuC5+Dyp766eub9kMYsSb6xd7FTqotqCG2GQxEymnEMB6uddGc0QX
+/mu5bhTBwPmoil5Tx0Yf9MFDh4wFMmQqhltEcr8zuAWgJQmfyYXmU8QA2XX1m4lb
+Sh2wYVhD1+aIC3gsEegcryfMxql6JhIsWsBUN+APgnulvy7npwaenrDv1VYjn8j4
+5XRXqYFbOS/dDCivg2JZXHK6lpnuiOqvNjnora9uwfOS6WD9AVCMtZdaYuk2jLo0
+TL45CXcEGCARudBj/C/0c0QLRCI5fYjPivThl1EIeqes7mDrDfUfGAXXkyEY4vuF
+21MbkD6QhC4xp+hmWuCX1ek4dAvx4Be7HZbEwtFfSF2tPs+pPMR7Wbr2CXdHfeOD
+VHE7SiPZXVVwJILfv0P1Ao67ou3jbtCeRuvKuV6sWDePVMtu6XQfcnpJfro3p7xc
+mfPThFO0GZYTkidqkklN12WHow+vTFRnOGQ59i8+BCMCpBFj0x04BZvnyYWOXrAN
+Jog4jALyjhJtVKIQPAAy604hT0qhN1qoCxLKkRKRVRu2gvEQpYuPoTvT0k9WTBjd
+4gaFCiSin8Y3lSfIgFkpksMBEnfcVtJNG2htKKXTATuXmuat9I+VBTdigCBPlzMr
+Tgw4NibnuihosJoGZn1p/4ll+gX5JJ9CwDFS+MhgY4HhN1E5/H8keNECAwEAAaNM
+MEowKQYDVR0RBCIwIIIeaHR0cHM6Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMB0G
+A1UdDgQWBBQY8DklOJVTDzKZH00kWeyZptlwgDANBgkqhkiG9w0BAQsFAAOCAgEA
+SiHcXxHBZhNVX8TQsnMj9tofono8lWSp3+RNH4sCVldKt9Mymk6lLdp+NSAwS1RA
+eqg7mtkOZd3BpOFtnZFKcTCocQO3msqS53VJD2zoCurnzjLlI1IKznEfw6GWL6B5
+B2AX4ItLGm8VycYf3ljUsCfKcBa/sEMlVGVo8eb1VUrdmWJNoEBPvS9pQNRoRZ+T
+5z4eDfMvBqniHmxmguF4v2v9aixC620sFTZ/ggwe5B1vkJ8bdykP5ITCF4UcCJ/M
+4vGvJbuXvjm9bjei54Ot5az/IvbUcVyThboaFb2e2E3+pS2nYx2k+xMLl70wPFQg
+beXYFlphlMZfOpdDsLFyLvO6g9S7ZdYGljrCDqiMAFK32OYsiI81FQXS4Icdqw2g
+ZXLLdKKQtosbFEzhdWQvobzAE1QgunZqTmy4MCetuVv/2qwbH9PzJnp+OkN6k8Mg
+kuC5RYE0YWieV8eTuCmK9VAbjk3hL80vhwQBDtbUMx9ZNSAezEt+e10fvYiw+xOl
+jzFg2EOoZNFhjZNALE/JCPYr6VMv16eCmURo25vE7U31sJnORyLs+pCbBRprzSpd
+ZaCP3V1IqZ/OnGG19co5sS1MDwh6Mdfui8fizt+ZMXisfthDjfVHFxaiz1DP5g9d
+hzESbKUtry32f5UndGS1iWU7Fr2zvh6atywcB1Jg9Ao=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -96,10 +101,10 @@ V/ml76bFEofGNdbAHcbMsA==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL>
   </md:Organization>
@@ -116,7 +121,7 @@ V/ml76bFEofGNdbAHcbMsA==
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+    <md:GivenName>Paulo Pamplona</md:GivenName>
+    <md:EmailAddress>mailto:paulo@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3