From ec4969c3058b49f4efc82e139970fbd1bf333831 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Wed, 21 Apr 2021 13:03:46 +0200
Subject: SWAMID-208, Ny SP dnsrpz-lookup.sunet.se

---
 swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml | 119 -----------------------
 swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml    | 114 ++++++++++++++++++++++
 swamid-sp-2.0.mxml                               |   2 +-
 3 files changed, 115 insertions(+), 120 deletions(-)
 delete mode 100644 swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml
 create mode 100644 swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml

diff --git a/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml b/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml
deleted file mode 100644
index 58b05aa8..00000000
--- a/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<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://dnsrpz-lookup.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <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.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://dnsrpz-lookup.sunet.se/Shibboleth.sso/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://dnsrpz-lookup.sunet.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">DNSRPZ Lookup</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DNSRPZ Lookup</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Kontrollera eller rapportera dåliga domäner till SUNET SOC</mdui:Description>
-        <mdui:Description xml:lang="en">Check or report bad domains to SUNET SOC</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>dnsrpz-lookup.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=dnsrpz-lookup.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEFDCCAnygAwIBAgIUegFDAAfhUSsxF+5eVrKgTpkqKOAwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAxMWZG5zcnB6LWxvb2t1cC5zdW5ldC5zZTAeFw0xOTEwMTUx
-MjUyNDZaFw0yOTEwMTIxMjUyNDZaMCExHzAdBgNVBAMTFmRuc3Jwei1sb29rdXAu
-c3VuZXQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDjSANfJEI9
-fxJGCy+k54ZtcFIJpSiaRak0vwMoO0f2RCD8TDYwuYVi1PG4FOMv8UeEbAcpcuKR
-rFzdiVXgQQCVbUAEZK1iraXSa5MSjirRv0g3YclP3+nyA/l0AFv/j7afEtQW9T2W
-1LkIVe/Wwn3bOL7Rr0TxfOSeCEmsb+/NEat9tmP4oygZlirP+uajsq9OnOVhixts
-aJ6XVP/fnJn3Nr53Wt4D6RU9q9nK1NIMKu+o8jL1FAOJDBkn4MVEgnZxWtDnjC7l
-C8hP+ikFhx1TeCX3EhXhdgeE/KXUBuEalk7ddRe1d6CjFB6X3/DB/9aSHnu24H5z
-ei+EuJqtdWJyABLRg3l1oayQmgeG3nKiqgFj87jJFkvucjZD/T1JL8WHhK4ww7mg
-exAvw/9lA25vcgGyo9eCJO8uIIAw6vfvtTUqecqvqZa8tVRxUHjUNSONrG/tZRIo
-TwFFzIt2bC9+svyRk6JdMH6fUZnk6/B3OJ2DkGyPd4jINyMTBzlNeqkCAwEAAaNE
-MEIwIQYDVR0RBBowGIIWZG5zcnB6LWxvb2t1cC5zdW5ldC5zZTAdBgNVHQ4EFgQU
-aFzLXb25zP9mqM/AyAoLBkNLb0EwDQYJKoZIhvcNAQELBQADggGBADB3Oqaazluv
-nvW/QOJH3HqbSGxXN8KDXmrOfoXsfr91qDKlBX7R/dbaE24lAATFkcATWuoMleU3
-w0kv+plyw5JqskzuDuC1iopdu2xo4aHHDK8mZ8V26n63lt8K+c1bi9WyJV/WrZwS
-GKEHDcSOfQtyXdBO7Gotigb/pr2rRAQgU83LNF5kolvjkRYSG36sN75OL3XPR6Mq
-qMlqc2XTAgl3WcyYrimTb19vYr2BGizwb+On3KulwdO3H/izUiS0dGK6q0i9gw/i
-ZkfmprB+nWbTcLd7i/8IImGT0VukslgVRpCd2TyqInPJWfIY7KbPn+0IkBMpN07+
-EeUbmUOSeuWKXMTZJOVS1XLYfDqdjupWCgOOa4cGJzWCGIZECBaxPXQEiZbOEEtA
-0iz1P3xbtRaHCQCqL0QwGBAuAQrgFEQ2RZ9jDhGtQ2k9HYfT4nW3Ub4p2nWRmSB6
-9/s+ttnP7sfYIHos7I8VrEuK26MIfLPVD6ErF4HsdauYG+je0B3KzQ==
-</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://dnsrpz-lookup.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Swedish University Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en"> SUNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>SUNET</md:Company>
-    <md:SurName>Pettai</md:SurName>
-    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SUNET</md:Company>
-    <md:SurName>Pettai</md:SurName>
-    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>SUNET</md:Company>
-    <md:SurName>Servicedesk Umeå universitet</md:SurName>
-    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml b/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..24d75d0c
--- /dev/null
+++ b/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml
@@ -0,0 +1,114 @@
+<?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://ioc-lookup.sunet.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://ioc-lookup.sunet.se/Shibboleth.sso/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://ioc-lookup.sunet.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">IOC Lookup</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IOC Lookup</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Kontrollera eller rapportera dåliga domäner till SUNET SOC</mdui:Description>
+        <mdui:Description xml:lang="en">Check or report bad domains to SUNET SOC</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>dnsrpz-lookup.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=dnsrpz-lookup.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEFDCCAnygAwIBAgIUegFDAAfhUSsxF+5eVrKgTpkqKOAwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAxMWZG5zcnB6LWxvb2t1cC5zdW5ldC5zZTAeFw0xOTEwMTUx
+MjUyNDZaFw0yOTEwMTIxMjUyNDZaMCExHzAdBgNVBAMTFmRuc3Jwei1sb29rdXAu
+c3VuZXQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDjSANfJEI9
+fxJGCy+k54ZtcFIJpSiaRak0vwMoO0f2RCD8TDYwuYVi1PG4FOMv8UeEbAcpcuKR
+rFzdiVXgQQCVbUAEZK1iraXSa5MSjirRv0g3YclP3+nyA/l0AFv/j7afEtQW9T2W
+1LkIVe/Wwn3bOL7Rr0TxfOSeCEmsb+/NEat9tmP4oygZlirP+uajsq9OnOVhixts
+aJ6XVP/fnJn3Nr53Wt4D6RU9q9nK1NIMKu+o8jL1FAOJDBkn4MVEgnZxWtDnjC7l
+C8hP+ikFhx1TeCX3EhXhdgeE/KXUBuEalk7ddRe1d6CjFB6X3/DB/9aSHnu24H5z
+ei+EuJqtdWJyABLRg3l1oayQmgeG3nKiqgFj87jJFkvucjZD/T1JL8WHhK4ww7mg
+exAvw/9lA25vcgGyo9eCJO8uIIAw6vfvtTUqecqvqZa8tVRxUHjUNSONrG/tZRIo
+TwFFzIt2bC9+svyRk6JdMH6fUZnk6/B3OJ2DkGyPd4jINyMTBzlNeqkCAwEAAaNE
+MEIwIQYDVR0RBBowGIIWZG5zcnB6LWxvb2t1cC5zdW5ldC5zZTAdBgNVHQ4EFgQU
+aFzLXb25zP9mqM/AyAoLBkNLb0EwDQYJKoZIhvcNAQELBQADggGBADB3Oqaazluv
+nvW/QOJH3HqbSGxXN8KDXmrOfoXsfr91qDKlBX7R/dbaE24lAATFkcATWuoMleU3
+w0kv+plyw5JqskzuDuC1iopdu2xo4aHHDK8mZ8V26n63lt8K+c1bi9WyJV/WrZwS
+GKEHDcSOfQtyXdBO7Gotigb/pr2rRAQgU83LNF5kolvjkRYSG36sN75OL3XPR6Mq
+qMlqc2XTAgl3WcyYrimTb19vYr2BGizwb+On3KulwdO3H/izUiS0dGK6q0i9gw/i
+ZkfmprB+nWbTcLd7i/8IImGT0VukslgVRpCd2TyqInPJWfIY7KbPn+0IkBMpN07+
+EeUbmUOSeuWKXMTZJOVS1XLYfDqdjupWCgOOa4cGJzWCGIZECBaxPXQEiZbOEEtA
+0iz1P3xbtRaHCQCqL0QwGBAuAQrgFEQ2RZ9jDhGtQ2k9HYfT4nW3Ub4p2nWRmSB6
+9/s+ttnP7sfYIHos7I8VrEuK26MIfLPVD6ErF4HsdauYG+je0B3KzQ==
+</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://ioc-lookup.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Swedish University Network</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en"> SUNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>SUNET</md:Company>
+    <md:SurName>Pettai</md:SurName>
+    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SUNET</md:Company>
+    <md:SurName>Pettai</md:SurName>
+    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>SUNET</md:Company>
+    <md:SurName>Servicedesk Umeå universitet</md:SurName>
+    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a1dad97a..798c6e61 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -546,7 +546,7 @@
   <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kb-se.zoom.us.xml"/>
-  <xi:include href="swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test0.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test1.release-check.swamid.se-shibboleth.xml"/>
-- 
cgit v1.2.3