SWAMID-907 Updated fs.nrm.se

1 files changed, 53 insertions, 51 deletions

diff --git a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml b/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
index 78b05709..541e90e7 100644
--- a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
@@ -5,17 +5,17 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla: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-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fs.nrm.se/adfs/services/trust">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fs.nrm.se/adfs/services/trust">
+    <md:Extensions>
       <shibmd:Scope regexp="false">nrm.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Naturhistoriska riksmuseet</mdui:DisplayName>
@@ -26,51 +26,53 @@
         <mdui:InformationURL xml:lang="en">http://www.nrm.se/en/16.html</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="76" width="88">https://www.nrm.se/images/18.33f35f55112e1f929a580001275/1367709414980/Logga.gif</mdui:Logo>
         <mdui:Logo xml:lang="en" height="76" width="88">https://www.nrm.se/images/18.33f35f55112e1f929a580001275/1367709414980/Logga.gif</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.nrm.se/ommuseet/integritetspolicy.9006004.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.nrm.se/en/ommuseet/integritetspolicy.9006004.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC1DCCAbygAwIBAgIQZXivbwVw+4tFxGQ/60BCNzANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBmcy5ucm0uc2UwHhcNMjEwMjE4MTExNjQ0WhcNMjYwMjE3MTExNjQ0WjAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBmcy5ucm0uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl38QCtc7Bg0LiWeZJPq4vcf9/RD6jrnoI3yNTkhQ9uSFYs4iI7HeltQmjjW6HzW/osx2eXl+g4xdx9Bf9m9qcUvZpqOHSMBaSQjwGNNexRDlSO283sHGhcA306UBfopsYslylCesko5LzkP125jntMBHbFEjyl5FlcOpW6fnWkTD8BVQSaqT3ahEyKSdnOg8Hjm4fONtYx3k5o8psrXqHLkGq7/3WEi+nzwUS1hYRx4g0n7fL9IA0LcfZgBioVPMa0lYMbwMTXISKfy6TD57U0wdEpvb8vCd8c0RSYGTAF9+JqcMBnx47vVU2+aTopNrcHPMg9tWhXYZXS+BWvjalAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF0ZJCHqJpuo7VRq767IgN1QW+wglcjWHFRrN7oP5iZRb4EI3UtTz00+zlp4K5lJPblE+8lKojB/rXT/6SOUlu9168JY66TDpHuH+zf/uLfB4dnfPiCridiRQmh/u/yIXu6OQdYlg/G9bxB5fVbxxFjKIJ0MNeFRbIBVI7A4uYtZEX9tpf2hKuZSWokbOeo1YaZT9tmuzmOJpy+MEXUBG/YH3hcgRXNyM6ur8e1veGCy7fmS68olhLZKDSkycbp1PP8wQeOMAnGEnBdUAkS17fS9BFjN4TXpb0gKvN6ny+NsBFYU96CaT4eEAoTBHaoh8lyLTDZpdwdPcwtiZ7m0GMs=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIICzjCCAbagAwIBAgIQGeZHUtbn9btIqQxDhdYqgDANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBmcy5ucm0uc2UwHhcNMjEwMjE4MTExNjQzWhcNMjYwMjE3MTExNjQzWjAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBmcy5ucm0uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7Y8fy9snj+DnaiLD973ewNrXFkBCm3YYjGMNtQlRzISJFs4ZZHxMqkbiJB0OjTt1Sj3NEGvgXl1n10i5enIhYkD4NAYCU8U9xu86X8daq0Nn6RkHE3wv+FEnGDt+XhQ+NJYxkCO/0j4FDauJQ2G0G3UVraKIy3O1zrhlJfRT3Ydnf+hhHrRG4zHWR82IRYLSejVI51qd2GTVIPYlrgIegRc8Tf8rteSznRY+I7yOZdvals9GHQ9jtx5939++z0juedmoYFoqEWrYvyQD/sWvIoeyJEyEjEMqsTdDQawJDCSCYinP+BT02lhMuuHxcQKhJ0BlmEMjDwhaIhnJ+msY5AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHMUURnNfXGVlPBVMMz/3I9VFQNU/joANAW57J8Gs0Ky/DHaXO9cDPedYQvjHXVAlpZEBSRw1SA5I+qzaIDcb470dQ2RBN9eXTmBg2NSLgB+mDEhOyL1IEWj2H8Nh3ZiPwkAAWvjLgjJo1zYeXCf2XeUat/mnHDJAXv8YnZ/wsKECELiecll+6oLbLKFH3T0qCrMB1+iXGjpdHlX/zMn2zYuah6XCgMn/2gMsvqNQq5nayn3BLX/uvsDc5j8as/ILs9xsI+IlSNFT7OFs0vZWpNR2I11HhiITDwFnjZvYECwQA1RI0FVqMQ3esN1C1+kvaQHbMzKI7uJE/d4asrN/l4=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.nrm.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.nrm.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.nrm.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.nrm.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Naturhistoriska riksmuseet</OrganizationName>
-    <OrganizationName xml:lang="en">Swedish Museum of Natural History</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Naturhistoriska riksmuseet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Museum of Natural History</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.nrm.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.nrm.se/en/16.html</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Naturhistoriska riksmuseet</Company>
-    <SurName>Användarsupport</SurName>
-    <EmailAddress>mailto:support@nrm.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Naturhistoriska riksmuseet</Company>
-    <SurName>System administration</SurName>
-    <EmailAddress>mailto:sysadmin@nrm.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Naturhistoriska riksmuseet</Company>
-    <SurName>System administration</SurName>
-    <EmailAddress>mailto:sysadmin@nrm.se</EmailAddress>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1DCCAbygAwIBAgIQZXivbwVw+4tFxGQ/60BCNzANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBmcy5ucm0uc2UwHhcNMjEwMjE4MTExNjQ0WhcNMjYwMjE3MTExNjQ0WjAmMSQwIgYDVQQDExtBREZTIEVuY3J5cHRpb24gLSBmcy5ucm0uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl38QCtc7Bg0LiWeZJPq4vcf9/RD6jrnoI3yNTkhQ9uSFYs4iI7HeltQmjjW6HzW/osx2eXl+g4xdx9Bf9m9qcUvZpqOHSMBaSQjwGNNexRDlSO283sHGhcA306UBfopsYslylCesko5LzkP125jntMBHbFEjyl5FlcOpW6fnWkTD8BVQSaqT3ahEyKSdnOg8Hjm4fONtYx3k5o8psrXqHLkGq7/3WEi+nzwUS1hYRx4g0n7fL9IA0LcfZgBioVPMa0lYMbwMTXISKfy6TD57U0wdEpvb8vCd8c0RSYGTAF9+JqcMBnx47vVU2+aTopNrcHPMg9tWhXYZXS+BWvjalAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF0ZJCHqJpuo7VRq767IgN1QW+wglcjWHFRrN7oP5iZRb4EI3UtTz00+zlp4K5lJPblE+8lKojB/rXT/6SOUlu9168JY66TDpHuH+zf/uLfB4dnfPiCridiRQmh/u/yIXu6OQdYlg/G9bxB5fVbxxFjKIJ0MNeFRbIBVI7A4uYtZEX9tpf2hKuZSWokbOeo1YaZT9tmuzmOJpy+MEXUBG/YH3hcgRXNyM6ur8e1veGCy7fmS68olhLZKDSkycbp1PP8wQeOMAnGEnBdUAkS17fS9BFjN4TXpb0gKvN6ny+NsBFYU96CaT4eEAoTBHaoh8lyLTDZpdwdPcwtiZ7m0GMs=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICzjCCAbagAwIBAgIQGeZHUtbn9btIqQxDhdYqgDANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBmcy5ucm0uc2UwHhcNMjEwMjE4MTExNjQzWhcNMjYwMjE3MTExNjQzWjAjMSEwHwYDVQQDExhBREZTIFNpZ25pbmcgLSBmcy5ucm0uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7Y8fy9snj+DnaiLD973ewNrXFkBCm3YYjGMNtQlRzISJFs4ZZHxMqkbiJB0OjTt1Sj3NEGvgXl1n10i5enIhYkD4NAYCU8U9xu86X8daq0Nn6RkHE3wv+FEnGDt+XhQ+NJYxkCO/0j4FDauJQ2G0G3UVraKIy3O1zrhlJfRT3Ydnf+hhHrRG4zHWR82IRYLSejVI51qd2GTVIPYlrgIegRc8Tf8rteSznRY+I7yOZdvals9GHQ9jtx5939++z0juedmoYFoqEWrYvyQD/sWvIoeyJEyEjEMqsTdDQawJDCSCYinP+BT02lhMuuHxcQKhJ0BlmEMjDwhaIhnJ+msY5AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHMUURnNfXGVlPBVMMz/3I9VFQNU/joANAW57J8Gs0Ky/DHaXO9cDPedYQvjHXVAlpZEBSRw1SA5I+qzaIDcb470dQ2RBN9eXTmBg2NSLgB+mDEhOyL1IEWj2H8Nh3ZiPwkAAWvjLgjJo1zYeXCf2XeUat/mnHDJAXv8YnZ/wsKECELiecll+6oLbLKFH3T0qCrMB1+iXGjpdHlX/zMn2zYuah6XCgMn/2gMsvqNQq5nayn3BLX/uvsDc5j8as/ILs9xsI+IlSNFT7OFs0vZWpNR2I11HhiITDwFnjZvYECwQA1RI0FVqMQ3esN1C1+kvaQHbMzKI7uJE/d4asrN/l4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.nrm.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.nrm.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <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://fs.nrm.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.nrm.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Naturhistoriska riksmuseet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Swedish Museum of Natural History</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Naturhistoriska riksmuseet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Museum of Natural History</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.nrm.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.nrm.se/en/16.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Naturhistoriska riksmuseet</md:Company>
+    <md:SurName>Användarsupport</md:SurName>
+    <md:EmailAddress>mailto:support@nrm.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Naturhistoriska riksmuseet</md:Company>
+    <md:SurName>System administration</md:SurName>
+    <md:EmailAddress>mailto:sysadmin@nrm.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Naturhistoriska riksmuseet</md:Company>
+    <md:SurName>System administration</md:SurName>
+    <md:EmailAddress>mailto:sysadmin@nrm.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>