From a5f0cdaf06351bc58b5328d1cc9eb6a7a59175dd Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 26 Oct 2021 17:24:13 +0200
Subject: SWAMID-439 add 3 cnaas SPs

---
 swamid-2.0/kth-nav.cnaas.sunet.se.xml | 108 ++++++++++++++++++++++++++++++++++
 swamid-2.0/mdh-nav.cnaas.sunet.se.xml | 108 ++++++++++++++++++++++++++++++++++
 swamid-2.0/su-nav.cnaas.sunet.se.xml  | 108 ++++++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                    |   3 +
 4 files changed, 327 insertions(+)
 create mode 100644 swamid-2.0/kth-nav.cnaas.sunet.se.xml
 create mode 100644 swamid-2.0/mdh-nav.cnaas.sunet.se.xml
 create mode 100644 swamid-2.0/su-nav.cnaas.sunet.se.xml

diff --git a/swamid-2.0/kth-nav.cnaas.sunet.se.xml b/swamid-2.0/kth-nav.cnaas.sunet.se.xml
new file mode 100644
index 00000000..0942a146
--- /dev/null
+++ b/swamid-2.0/kth-nav.cnaas.sunet.se.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://kth-nav.cnaas.sunet.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-26T17:17:26Z">
+      <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:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">CnaaS KTH NAV</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CnaaS KTH NAV</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på KTH.</mdui:Description>
+        <mdui:Description xml:lang="en">Network monitoring system for CnaaS at KTH.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NAV+when+using+federated+login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>https://kth-nav.cnaas.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://kth-nav.cnaas.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIELDCCApSgAwIBAgIUKvOwV/XMYYQCKW7B+NFhl3ZBkLcwDQYJKoZIhvcNAQEL
+BQAwKTEnMCUGA1UEAxMeaHR0cHM6Ly9rdGgtbmF2LmNuYWFzLnN1bmV0LnNlMB4X
+DTIxMTAyNjExMzIwN1oXDTMxMTAyNDExMzIwN1owKTEnMCUGA1UEAxMeaHR0cHM6
+Ly9rdGgtbmF2LmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A
+MIIBigKCAYEAzcUjpalzYkqPWBEmvLuUMG8h4/iOtfzu1nHtLIYRfTgJn5NJ42sz
+G4ff5vYHpxk/ILmsjQwmQJkgdxibKlP3eabkAwpzwuex3fo47cdtMuivPJG0bcIb
+UpG+4NoEjzAJZ9s1jrVq8hui9G5bPaAXyHug4aMvyQXCiY+2VGmfMMbkeshDs5h6
+y8ZXRxiydrZ5VV74gAdSkkfFR7ft2BIPSBfR68JI+ijtUYy4qD+jSdchugrJYItn
+lbGq3RUEOhwmOb3Garkk9tH+wDTGkafZMqWcNKpNWNN74ChkAz6Ytd5gVJjS1fr/
+mYIhMQhEmeN9DViZo3E7MgGbXny5seTfE2DhOBDxy2pdINshOy65ZGUhTeaAWvCT
+hegW6IDZKT2mWYiLa+MjpKFprHqeQXblhRbiQb7hfvv8zwBiLqE0UOdmdNY3VXTn
+/8PURh0XZ44GiS1DOADxoN71OqC8gcVXt2nGeLyUOwPn4zrNnp39wsq/3fhoMykc
+QuvbmDH/911tAgMBAAGjTDBKMCkGA1UdEQQiMCCCHmh0dHBzOi8va3RoLW5hdi5j
+bmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUkt4LlB8V284S4jR73Hm5pS0ct08wDQYJ
+KoZIhvcNAQELBQADggGBAJ6LHReTZ+T1RS7tvjKcqD0z+cQceGM4xlKk3DVw9EOD
+eDhJw8V0QP3rZJfPFoMgNSZi2waJRYr47wO3f0DW8Hx9hBpo19QLzKXKF6/Vh3YJ
+f64tyh3vsD6xLF7L4UfXx4EfbCyOHP7TFHCHNsyRecD35RFO+E4vMsMwE4osaO3Z
++UNHF4BVEITxlAzBIRTTrrNwqniaaF8tTx1xyQTYvogRME/fbhbnytqHTfbg8yPJ
+WeIz2iCdQoSdk2sHhCa8YECujNsg94IYhE09DZ9JjOmEdluf6QzxRqHXdi5iR4HC
+Wcvj7rbnlhOPVq5baE3fBn0MQr+uo+CIBftetmv4HSDynxnpVLNjNKPor45aRCqg
+jgRoLczkEeqbANz6AiBYu7BD6LVWnglLbcd6w2iwpuZofTLEgH7rpt4vugRwcukN
+sUQu1UbTaCF5Rb+kgFXoePoO70wXQ3rLFLNcwtQnbSPBw1cHoSSBPwcwblSE2jSU
+AISFtyqcxrhuLJJ5YElANw==
+</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://kth-nav.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">CnaaS KTH NAV</md:ServiceName>
+      <md:ServiceName xml:lang="en">CnaaS KTH NAV</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sunet NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Ernst Widerberg</md:SurName>
+    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/mdh-nav.cnaas.sunet.se.xml b/swamid-2.0/mdh-nav.cnaas.sunet.se.xml
new file mode 100644
index 00000000..dd668943
--- /dev/null
+++ b/swamid-2.0/mdh-nav.cnaas.sunet.se.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mdh-nav.cnaas.sunet.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-26T17:17:26Z">
+      <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:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">CnaaS MDH NAV</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CnaaS MDH NAV</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på MDH.</mdui:Description>
+        <mdui:Description xml:lang="en">Network monitoring system for CnaaS at MDH.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NAV+when+using+federated+login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>https://mdh-nav.cnaas.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://mdh-nav.cnaas.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIELDCCApSgAwIBAgIUQQU/T34CH/36mXGHqOW7CXr26DAwDQYJKoZIhvcNAQEL
+BQAwKTEnMCUGA1UEAxMeaHR0cHM6Ly9tZGgtbmF2LmNuYWFzLnN1bmV0LnNlMB4X
+DTIxMTAyNjExMzAyNloXDTMxMTAyNDExMzAyNlowKTEnMCUGA1UEAxMeaHR0cHM6
+Ly9tZGgtbmF2LmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A
+MIIBigKCAYEAk7J8wSYg5tTkf3nsqeKZUe6LBIhptwWGfeBNYvv6zNCIGNnUiRNW
+Qr3viFSLaZ61XQu4nfjCqNhjwO7htbfwTGi4vBr8aXAKoG20ZQZN7Q3nY+lzC7wE
+fQmYtsLxi96qZ4NQksQ9uP1ecfOctFg1igFJScvp5oS5bvYwWZnvzkBc/u8NtXfz
+h1GNSe/JdKP7KqV9tJqsk5IRLNUeMTM07D9AyJAhLVV6sOdXwLGzcVZakPnnLPsH
+XdLqpKlyLLdGwF/V9lE4YJmSWISfO9cMhe111yxk6q2rlFDiyf2UQgSI2ogfy1Tv
+XDZ5wRJdI/ynHQ9X+G+idTPcScqo0uPTxSv6GYqsd/bvl2XYawCZHtr3rdbRdrQL
+FU9CbeBjev73EPvKda9mZDwMc8Euw4P9Orcfq+YyY8S0Gj4hNEd7KgelkSNF+B6Q
+bhPVJcOLWZU4nJJJTS2QvLQv7mf67hcDS2Sp9mKH2Fqnyinkjng15VeYExFiyBa6
+4Nm0zxKwkfIVAgMBAAGjTDBKMCkGA1UdEQQiMCCCHmh0dHBzOi8vbWRoLW5hdi5j
+bmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUZ3B7+CSpHz4rhbB6LfDScch955AwDQYJ
+KoZIhvcNAQELBQADggGBAGSengycAd/hqPfRqgl723BfjEyFuT/xDeeJUlIrY9dt
+8nLIToHaG+vrS+gYXPxrLYCswuHMoD/dIYgWCrLDYU4tu5WWx3X6ocirm69IChs5
+Mhk7ZQsU2zKypYtXAu5+9hzdgXN02VHQrnbar7cbqGJFmRJDknvjjqgly2x4kUHg
+ndvEze71iPYgRva7DUi4ir4858arLg+W10iFWqTK0PVjDwdJO7ulBAwOvIyPPtBn
+V6vazYAEr5vZg2Av0k6em9tCZtUnxZfRYM8kf/Jz+JhqyziLVGbVLTaAN+IAGuyA
+gTaVVNAKTMr22kJY1aH3JY8ZNdzRsEpH0AHRgJB/4WnML55IA8P93AR8mV4xpIGs
+RNUGLThjjZyAm17KIfhlgZqnYALJNs9VO8vQgHL1c64dJXo6OJSO9vI5G9ftSf8+
+/amVTJRv78GSUHh1I1K7LWmPCl3WaCpdP5KcX+c/2o0KJwB0URgBGm/5YaM/ZBz7
+CaDiZFn/kx5eL2RkbUNCEg==
+</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://mdh-nav.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">CnaaS MDH NAV</md:ServiceName>
+      <md:ServiceName xml:lang="en">CnaaS MDH NAV</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sunet NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Ernst Widerberg</md:SurName>
+    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/su-nav.cnaas.sunet.se.xml b/swamid-2.0/su-nav.cnaas.sunet.se.xml
new file mode 100644
index 00000000..08bc85fc
--- /dev/null
+++ b/swamid-2.0/su-nav.cnaas.sunet.se.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://su-nav.cnaas.sunet.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-26T17:17:26Z">
+      <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:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">CnaaS SU NAV</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CnaaS SU NAV</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på SU.</mdui:Description>
+        <mdui:Description xml:lang="en">Network monitoring system for CnaaS at SU.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NAV+when+using+federated+login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>https://su-nav.cnaas.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://su-nav.cnaas.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUfBfiXvFlsYv55XGDJKhg9wehGigwDQYJKoZIhvcNAQEL
+BQAwKDEmMCQGA1UEAxMdaHR0cHM6Ly9zdS1uYXYuY25hYXMuc3VuZXQuc2UwHhcN
+MjExMDI2MTEyNTIwWhcNMzExMDI0MTEyNTIwWjAoMSYwJAYDVQQDEx1odHRwczov
+L3N1LW5hdi5jbmFhcy5zdW5ldC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC
+AYoCggGBAOzBRkv0cPVt4x+meNZgzTXbAckq2u/1yu7z89QlGCBTxAqU8hDaBvW9
+T3gZY/SpasNTqIcj7tQ5Hx30HGQtno0xbtZjrVJFHi7r9BszyEm9cbXYW/2vnKGD
+BbcmZa8N2moSkhBh8L9ba6ubsflIKYdiRJXppmckJb08uaqembNJiw8rEvXLQaOj
+7nnYtJPAH7kvoRR0QFV1wAAGrToPtBULgLtIw5nkDOrK2Wp2mONpvX/4fXzFNktS
+OrHalc1HQ3l3fpI05fm1w+mWggi0GC+7IKs1hPKdqFSPJAG2g8f98EL0T9PZW4yd
+kwKo2DHCD84p9BkAFN9jxx9jzkjSDrSIFXRa7wcvksz9u/vSWOCVlYTQTbb0hce2
+WW/cSZ0FTYpCh4KLHWb3UuqeBNZ8DQrJkgdjgV82lvG8aXGWzGELMrpwg52T/EUJ
+MgWO0As/tI6f62r4X0Vro10CxmrNJfBevL4u7kbNGJgbgEhNUMaQtt0ASQAGY2TB
+OgvzPmgP/wIDAQABo0swSTAoBgNVHREEITAfgh1odHRwczovL3N1LW5hdi5jbmFh
+cy5zdW5ldC5zZTAdBgNVHQ4EFgQUKgrsX8Q9cU8YDfKyu5GCxHgKr44wDQYJKoZI
+hvcNAQELBQADggGBAM4z2utUGKrc2ps9eAxCIvybncheCXIvqdkYIFGBwKLxyniK
+HTwPCyzUdLycEWxLFqHrs5XRXJ4+ATOILi6Ad5TvOcZxujg0N/jq6IzdxBCNiZxb
+FS3a4MSt1kISOiBuYcAyS6f95WsWnjhhv6HgCgqIqVGohEQOweF7gAqwrpAjkqRE
+Y3tLpg9K6RfOrz12SiQa6I3NyBbmkO0jVkN3YLPvdLJdf8/j/chgODFZPlsqLhlr
+qLVv7eSLgM02TCnVEV1oMEgOvZLNREpfwgL1sXcYN2t+j1Dv/SNhpAg7IhQ+sDfA
+4AGbAfMQFfz3tXRGbJMETi7w7DqejwvHGkB7rDXZWa0VfItNxrz81lJ7l2PYuJsa
+AIiv6edbrDSfBhRmIzhBbf9wy8NPNYmoiFmZu4RENvYNQfyN9P6Q6sjtm+QAWq0i
+P0Cs/+p7gXBp5xsB0glXpKgWgRoyYoumeV96RJeR4tciXRj5KKNaLhyPfaT2RKmX
+lh3MzdEGeM5NWMmMSQ==
+</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://su-nav.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">CnaaS SU NAV</md:ServiceName>
+      <md:ServiceName xml:lang="en">CnaaS SU NAV</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sunet NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Ernst Widerberg</md:SurName>
+    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f42c2811..0e105487 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -720,4 +720,7 @@
   <xi:include href="swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-isp.sae.kau.se-isptest.xml"/>
   <xi:include href="swamid-2.0/metadata.lab.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/su-nav.cnaas.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/mdh-nav.cnaas.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/kth-nav.cnaas.sunet.se.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3