new common box gw

7 files changed, 54 insertions, 71 deletions

diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..39fd5e42
--- /dev/null
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <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/eu-adequate-protection</samla:AttributeValue>
+          <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">NORDUnet Box</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NORDUnet Box</md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NORDUNet</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/uninett-box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/uninett-box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 060317fc..00000000
--- a/swamid-2.0/uninett-box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">UNINETT Box</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">UNINETT Box</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUNet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/uninett-box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/uninett-box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 59dea35c..00000000
--- a/swamid-2.0/uninett-box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://uninett-box-idp.nordu.net/simplesaml/saml2/idp/metadata.php">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uninett-box-idp.nordu.net/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uninett-box-idp.nordu.net/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUNet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-edugain-1.0.mxml b/swamid-edugain-1.0.mxml
index ff4cb3f1..8758486c 100644
--- a/swamid-edugain-1.0.mxml
+++ b/swamid-edugain-1.0.mxml
@@ -23,4 +23,5 @@
   <xi:include href="swamid-1.0/idp.bth.se-idp-shibboleth.xml"/> 
   <xi:include href="swamid-1.0/login.du.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-kalmar-1.0.mxml b/swamid-kalmar-1.0.mxml
index d3e3cfb9..112139d7 100644
--- a/swamid-kalmar-1.0.mxml
+++ b/swamid-kalmar-1.0.mxml
@@ -15,5 +15,5 @@
   <xi:include href="swamid-1.0/connect-beta.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/connect-stable.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/uninett-box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+  <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2c06952c..978d07d5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -59,7 +59,6 @@
    <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml"/>
    <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sfs-sp.xml"/>
    <xi:include href="swamid-2.0/xenosmilus2.umdc.umu.se-8086-sp.xml"/>
-   <xi:include href="swamid-2.0/uninett-box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
    <xi:include href="swamid-2.0/aktivera.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/portalservices.miun.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/hashog.umdc.umu.se-8087-hth.xml"/>
@@ -77,4 +76,5 @@
    <xi:include href="swamid-2.0/kilwtest.it.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/lpwtest.it.ki.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
+   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index ff4ca9a8..b72ba49c 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -141,5 +141,4 @@
   <xi:include href="swamid-1.0/ecsidp.testb.antagning.se-ecs-idp.xml"/>
   <xi:include href="swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-1.0/idp-fre-1.eduid.se-idp.xml"/>
-  <xi:include href="swamid-2.0/uninett-box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
 </EntitiesDescriptor>