Merge branch 'master' of md-master.swamid.se:swamid-metadata

3 files changed, 57 insertions, 1 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index d30e750c..553d6dfb 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -193,4 +193,5 @@
   <xi:include href="swamid-1.0/vmidgw3.miun.se.xml"/>
   <xi:include href="swamid-1.0/idp-test.kau.se.xml"/>
   <xi:include href="swamid-1.0/graduateland.com.xml"/>
+  <xi:include href="swamid-1.0/its-pd0062.ad.umu.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/its-pd0062.ad.umu.se.xml b/swamid-1.0/its-pd0062.ad.umu.se.xml
new file mode 100644
index 00000000..23ab7c14
--- /dev/null
+++ b/swamid-1.0/its-pd0062.ad.umu.se.xml
@@ -0,0 +1,55 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_e56f78a6316466547e4665687e6b60fb867d9bd0" entityID="https://its-pd0062.ad.umu.se/shibboleth-sp">
+
+  <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://its-pd0062.ad.umu.se/Shibboleth.sso/IDP"/>
+      <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://its-pd0062.ad.umu.se/Shibboleth.sso/WAYF/ds.swamid.se"/>
+      <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://its-pd0062.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://its-pd0062.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <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://its-pd0062.ad.umu.se/Shibboleth.sso/WAYF/testc.ladok.umu.se"/>
+      <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://its-pd0062.ad.umu.se/Shibboleth.sso/WAYF/testb.antagning.se"/>
+      <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://its-pd0062.ad.umu.se/Shibboleth.sso/WAYF/testa.antagning.se"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>its-pd0062.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=its-pd0062.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAISQ+6OrrBvmMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGl0cy1wZDAwNjIuYWQudW11LnNlMB4XDTEyMDQwNDEzNDQyNloXDTIyMDQw
+MjEzNDQyNlowHzEdMBsGA1UEAxMUaXRzLXBkMDA2Mi5hZC51bXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV0RgOrba9T2uZM3oirmyK0pCuuE4G
+mBw0Xk1urDsI7SRZ86zZP+e0yZYPIHDO8W1O0ca2cTrWixg/mjSRUEHb84ja7pwE
+KdJ23uhEMpfVCG2wfOOWMoWsuPjsA+EwaV8Sd0wfOHnlHeiZnZfLPT6rX/r81hOe
+glFxZX/jYmhbATAx333CpCcCK4sE9PK6lilgMhBBTMqFQw0ORKpNk8MXYAc3ws+m
+0oJonE3R/1u7CuoRbC6ByOgv8ygF30Wsbxi1mew8schl/xdRZ827hI4Vpx3NsUlT
+4i4rN91L2WfaSjnzlXoV6Mgl+lrdnJEzlaBk+a2TnN4jQGUElCvj4tr1AgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGl0cy1wZDAwNjIuYWQudW11LnNlMB0GA1UdDgQWBBSt
+oiK8tNwfMNNOo9CtJ+Ch28e9kzANBgkqhkiG9w0BAQUFAAOCAQEARczFJycPFM5g
+dZu0R/ET3IlhaLzam8np4HudzZG321dBuqy1kmJX11gCtT39gJJCFU4TJqTZZQN5
+a3DgryGRz9+a/YsUwQSSQooFqeI7lgWdOsfjeRYxrj3IWYtK+1Djmv1FqCrKiY6I
+q33PJ7wIY9VmHLuZNRvnPJymJ96KXp1PGuzPf+D9EJAmLACahbtKQN4BPZRUY2W1
+gPYoStBXXQQMzgcSfcJ30uSYzJKp/xbjR+X8ATcrcy1rruzix+4nq7RuyZ9IVaTT
+x8KpMVoGa5QkJcKJqsqD0oBy6YCPuJiDcouhncPIU+cy5vTOG9YXjzBC/Td01ZLn
+XF6Xb2bzkg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://its-pd0062.ad.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/livesrv.ex.vr.se.xml b/swamid-1.0/livesrv.ex.vr.se.xml
index e27fdaf4..4a8499b9 100644
--- a/swamid-1.0/livesrv.ex.vr.se.xml
+++ b/swamid-1.0/livesrv.ex.vr.se.xml
@@ -109,7 +109,7 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
 

 <Organization>

     <OrganizationName xml:lang="en">VR</OrganizationName>

-    <OrganizationDisplayName xml:lang="en">Vetenskapsrådet TEST</OrganizationDisplayName>

+    <OrganizationDisplayName xml:lang="en">Vetenskapsrådet</OrganizationDisplayName>

     <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>

   </Organization>

   <ContactPerson contactType="technical">