From e12029fe2711d76b6837f3f14adaf1750faf3061 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Thu, 31 Aug 2017 11:53:49 +0200
Subject: Resolved SWAMID-185 added local.cloudmore.com

---
 swamid-2.0/local.cloudmore.com-shibboleth.xml | 78 +++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 swamid-2.0/local.cloudmore.com-shibboleth.xml

(limited to 'swamid-2.0/local.cloudmore.com-shibboleth.xml')

diff --git a/swamid-2.0/local.cloudmore.com-shibboleth.xml b/swamid-2.0/local.cloudmore.com-shibboleth.xml
new file mode 100644
index 00000000..e36d8f99
--- /dev/null
+++ b/swamid-2.0/local.cloudmore.com-shibboleth.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://local.cloudmore.com/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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"/>
+  </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="http://local.cloudmore.com/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="http://local.cloudmore.com/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>desktop-cu2qb29</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=desktop-cu2qb29</ds:X509SubjectName>
+          <ds:X509Certificate>MIID9DCCAlygAwIBAgIJAJKf3OTHrjQ/MA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+BAMTD2Rlc2t0b3AtY3UycWIyOTAeFw0xNzAyMjcxNDU1MDdaFw0yNzAyMjUxNDU1
+MDdaMBoxGDAWBgNVBAMTD2Rlc2t0b3AtY3UycWIyOTCCAaIwDQYJKoZIhvcNAQEB
+BQADggGPADCCAYoCggGBALhxwbvMdesrUcyhorZ9bHNSWWtqJIrHPT9jGJI5W0oJ
+SosOLD/mrCSy618yHoYl+oo2nE4u/+VDE2CJhrjkThwp+C3bLI/jTYrn4E2w1cVw
+5ws1Cmo7iJ8wEsX4ZpvSpPG7DRUcppzDLbizGUZoZ/7lKDUWEqX+pUErrJCcxk7v
+hDlXyXXdkc4R18hUUIQHMu5XHjDQ7NH5rrLmxNcYdLEg9KG44CLmcgz3ptcDXZRp
+mhvAr55XtDq/3rk/bJODy65F+P/AzTK1AD3hr/7VtqANfp6Gj+FECC9ahVYcQg9z
+8YFrh3T2B86xnRwBpGj5GdAB1Sl48OqpoJvhRd0hAQnxPTyEyr/O3lQX0Ln68Ho2
+0SC+WkSi1GwGP+av8PKZj8UO5KeLwSeUYhqVMMs/jGrfaM278oHWldzo8VfVwsAR
+9/chJ6JN3bUum//bdIgwqQyxS+m+5/tCFZ3IAOWraXYJpofG+vtCJH5THWvC/Pfp
+P17k0KFHDONEbCy+BMJguwIDAQABoz0wOzAaBgNVHREEEzARgg9kZXNrdG9wLWN1
+MnFiMjkwHQYDVR0OBBYEFBJHwGN/tsmAUm7VVbqf3BLHTKNaMA0GCSqGSIb3DQEB
+CwUAA4IBgQC20sT9vv9RVhEvItcTDpV/hOtrhcAtDLfe0jUnycscDbN+zsn9TVE+
+oWyV1a90/YiTbVAdyTW518NjU4APqwghEhHlY2U1wNCsYFxmceQvyCyAAfZjvugR
+xxw8YnPc3z2M8sriHpnvLEwG84ZGn5VmKAmFlapmpM3SuhT+jg716oB8ZZuB3IRh
+tPrIQXdSEtsL+Ogol+UtbraP1iseSmpFoCNLSpUgsdIf0U4BMXEfVAMv3R1w7elR
+FefUWlzgJ1UG0hSKIZilR8YMI0o3fF9nfMDWkGgyV5+fbnogKVNNQIbiFIIIBdhH
+a9ikla+Yzxv5MqqlRh0dlbjwuPWUEbxzV01N7gjtUp+m3G8HAWe/84bGNzqW5L0J
+ImSwMsvQbjyWBkgs0ruxX7osN1cqyIMRB3KefI7XpBrQXmVqS7IbtGgypYZieVSo
+z8vMYWDvzD5siJ/O46xnsMzwTu2JXhVJpR0jzoADSftjsQe+4wgLXVg+46mapDoc
+f49DvQ516YA=
+</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="http://local.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://local.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://local.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
-- 
cgit v1.2.3


From c7ec662a964f33a1aca2b16640c713d8b468ed01 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Thu, 14 Sep 2017 09:45:38 +0200
Subject: Resolves SWAMIDOPS-195

---
 swamid-2.0/cloudmore.com-shibboleth.xml            | 94 ++++++++++++++++++++++
 swamid-2.0/dev.cloudmore.com-shibboleth.xml        | 91 +++++++++++++++++++++
 swamid-2.0/local.cloudmore.com-shibboleth.xml      | 15 +++-
 swamid-2.0/prestaging.cloudmore.com-shibboleth.xml | 92 +++++++++++++++++++++
 swamid-2.0/staging.cloudmore.com-shibboleth.xml    | 92 +++++++++++++++++++++
 swamid-edugain-sp-1.0.mxml                         |  5 ++
 swamid-sp-2.0.mxml                                 |  6 +-
 7 files changed, 393 insertions(+), 2 deletions(-)
 create mode 100644 swamid-2.0/cloudmore.com-shibboleth.xml
 create mode 100644 swamid-2.0/dev.cloudmore.com-shibboleth.xml
 create mode 100644 swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
 create mode 100644 swamid-2.0/staging.cloudmore.com-shibboleth.xml

(limited to 'swamid-2.0/local.cloudmore.com-shibboleth.xml')

diff --git a/swamid-2.0/cloudmore.com-shibboleth.xml b/swamid-2.0/cloudmore.com-shibboleth.xml
new file mode 100644
index 00000000..2010b8f1
--- /dev/null
+++ b/swamid-2.0/cloudmore.com-shibboleth.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://cloudmore.com/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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"/>
+  </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://cloudmore.com/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://cloudmore.com/Shibboleth.sso/Login" index="1"/>
+      <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://cloudmore.com/Shibboleth.sso/Login" index="2"/>
+      <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://cloudmore.com/Shibboleth.sso/Login" index="3"/>
+      <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://cloudmore.com/Shibboleth.sso/Login" index="4"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
+        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>stoprvfe01.domain01.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=stoprvfe01.domain01.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAJOLmVdtpocoMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMTF3N0b3BydmZlMDEuZG9tYWluMDEubmV0MB4XDTE3MDkwNTE5MDYyN1oXDTI3
+MDkwMzE5MDYyN1owIjEgMB4GA1UEAxMXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQw
+ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4YLswQuTzT9JcYWFe8PFZ
+oR/liIkoELde+7fJquGIUps2PflaSFcb8qf8LFik8OqB/WI3d1+ORN6S7TDrXbUN
+S+TNz4ngmc+qw3FQrHooleAgciPUpvA68g7qHGEjqqC4MggOWf31da7ICgpl+j8L
+rCdGWk0ea4rgH9KT9iercYdJfk41dS6VkwT2ARQVignuDMkqOV9BlR3fEyKFz7VL
+Kc+zYz0vtcSMIx85BffZ24oMbETeJkRCFUMqGkagsf/KKeTVRCbEnOosWYsac/Lj
+xQxFD+aKaKP5z6Wvd9EDKAa5egS5m556z58LUiUXT4QcRqc43OTcoI1OefeQT+B7
+0chHWZRXGzZWxNsDgbjUhBLcELh1H9ehc99TaNIXeIyYJgfZp2zXAsE8UGUqpL5p
+JI+OG/7au2kVipcQqbiMxYm+FhyLqzgRhNQrP4wXPee9Psyvy0ylIwveUY83uwBV
+EsAiyg6LD3KnYC4sZlr80GJ4l1Cp+4Q0101q6WeZRjMCAwEAAaNFMEMwIgYDVR0R
+BBswGYIXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQwHQYDVR0OBBYEFHzZ8nn/1Zj8
+kxrK0kLw3RlA/t9hMA0GCSqGSIb3DQEBCwUAA4IBgQCAOrmhhFLsfqYx6K+wKt7I
+HCqbsB0bhM8pccqWmUaUWP1WlRJOupIpOmP5FvIgvVtXsuEzUKd1voPF4DMfzaV6
+ACU6DxLf0lZ/3NrwM9ipVEE/zpXMHvBTn5802wcOIIm7hF+If83QM79ogex6b7gW
+oLhWfu1yz+2La4twB+6zkcz9THgkgSn0UtUNwd0HzyyHZ3SZuOMCGUIuyz+19c1n
++KX6CjsXpMcJ4Oc1HsbtCKNkvEwNudxeiXWSWzj5MQHMcALE/ybOiQ/NMmj5SUzt
+oySXpA6JvX5PwGbuyuy1j4u6gwunYWXWzA0/bEyYADM47ZfNhzD+52b3sVaM1ROB
+TFv0Jq/k9XzQGKyrxphatYKLFZZ92DBDrtnwE3YsIXYc8qzWV7fDbSdvJe6eRBJV
+nnp6KW+OGs5W4irV/BM+AE0LMh7hb4xWfN1xO8Z2nrgAWHNJUkFw74FkEa94t9Y4
+KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
+</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://cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/dev.cloudmore.com-shibboleth.xml b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
new file mode 100644
index 00000000..98f7e3f0
--- /dev/null
+++ b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://dev.cloudmore.com/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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"/>
+  </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://dev.cloudmore.com/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://dev.cloudmore.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
+        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>stoprvfe01.domain01.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=stoprvfe01.domain01.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAJOLmVdtpocoMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMTF3N0b3BydmZlMDEuZG9tYWluMDEubmV0MB4XDTE3MDkwNTE5MDYyN1oXDTI3
+MDkwMzE5MDYyN1owIjEgMB4GA1UEAxMXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQw
+ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4YLswQuTzT9JcYWFe8PFZ
+oR/liIkoELde+7fJquGIUps2PflaSFcb8qf8LFik8OqB/WI3d1+ORN6S7TDrXbUN
+S+TNz4ngmc+qw3FQrHooleAgciPUpvA68g7qHGEjqqC4MggOWf31da7ICgpl+j8L
+rCdGWk0ea4rgH9KT9iercYdJfk41dS6VkwT2ARQVignuDMkqOV9BlR3fEyKFz7VL
+Kc+zYz0vtcSMIx85BffZ24oMbETeJkRCFUMqGkagsf/KKeTVRCbEnOosWYsac/Lj
+xQxFD+aKaKP5z6Wvd9EDKAa5egS5m556z58LUiUXT4QcRqc43OTcoI1OefeQT+B7
+0chHWZRXGzZWxNsDgbjUhBLcELh1H9ehc99TaNIXeIyYJgfZp2zXAsE8UGUqpL5p
+JI+OG/7au2kVipcQqbiMxYm+FhyLqzgRhNQrP4wXPee9Psyvy0ylIwveUY83uwBV
+EsAiyg6LD3KnYC4sZlr80GJ4l1Cp+4Q0101q6WeZRjMCAwEAAaNFMEMwIgYDVR0R
+BBswGYIXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQwHQYDVR0OBBYEFHzZ8nn/1Zj8
+kxrK0kLw3RlA/t9hMA0GCSqGSIb3DQEBCwUAA4IBgQCAOrmhhFLsfqYx6K+wKt7I
+HCqbsB0bhM8pccqWmUaUWP1WlRJOupIpOmP5FvIgvVtXsuEzUKd1voPF4DMfzaV6
+ACU6DxLf0lZ/3NrwM9ipVEE/zpXMHvBTn5802wcOIIm7hF+If83QM79ogex6b7gW
+oLhWfu1yz+2La4twB+6zkcz9THgkgSn0UtUNwd0HzyyHZ3SZuOMCGUIuyz+19c1n
++KX6CjsXpMcJ4Oc1HsbtCKNkvEwNudxeiXWSWzj5MQHMcALE/ybOiQ/NMmj5SUzt
+oySXpA6JvX5PwGbuyuy1j4u6gwunYWXWzA0/bEyYADM47ZfNhzD+52b3sVaM1ROB
+TFv0Jq/k9XzQGKyrxphatYKLFZZ92DBDrtnwE3YsIXYc8qzWV7fDbSdvJe6eRBJV
+nnp6KW+OGs5W4irV/BM+AE0LMh7hb4xWfN1xO8Z2nrgAWHNJUkFw74FkEa94t9Y4
+KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
+</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://dev.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/local.cloudmore.com-shibboleth.xml b/swamid-2.0/local.cloudmore.com-shibboleth.xml
index e36d8f99..7709c982 100644
--- a/swamid-2.0/local.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/local.cloudmore.com-shibboleth.xml
@@ -22,6 +22,12 @@
     <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="http://local.cloudmore.com/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="http://local.cloudmore.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
+        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -69,10 +75,17 @@ f49DvQ516YA=
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://local.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://local.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
new file mode 100644
index 00000000..865eafc3
--- /dev/null
+++ b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://prestaging.cloudmore.com/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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"/>
+  </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://prestaging.cloudmore.com/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://prestaging.cloudmore.com/Shibboleth.sso/Login" index="1"/>
+      <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://prestaging.cloudmore.com/Shibboleth.sso/Login" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
+        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>stoprvfe01.domain01.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=stoprvfe01.domain01.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAJOLmVdtpocoMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMTF3N0b3BydmZlMDEuZG9tYWluMDEubmV0MB4XDTE3MDkwNTE5MDYyN1oXDTI3
+MDkwMzE5MDYyN1owIjEgMB4GA1UEAxMXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQw
+ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4YLswQuTzT9JcYWFe8PFZ
+oR/liIkoELde+7fJquGIUps2PflaSFcb8qf8LFik8OqB/WI3d1+ORN6S7TDrXbUN
+S+TNz4ngmc+qw3FQrHooleAgciPUpvA68g7qHGEjqqC4MggOWf31da7ICgpl+j8L
+rCdGWk0ea4rgH9KT9iercYdJfk41dS6VkwT2ARQVignuDMkqOV9BlR3fEyKFz7VL
+Kc+zYz0vtcSMIx85BffZ24oMbETeJkRCFUMqGkagsf/KKeTVRCbEnOosWYsac/Lj
+xQxFD+aKaKP5z6Wvd9EDKAa5egS5m556z58LUiUXT4QcRqc43OTcoI1OefeQT+B7
+0chHWZRXGzZWxNsDgbjUhBLcELh1H9ehc99TaNIXeIyYJgfZp2zXAsE8UGUqpL5p
+JI+OG/7au2kVipcQqbiMxYm+FhyLqzgRhNQrP4wXPee9Psyvy0ylIwveUY83uwBV
+EsAiyg6LD3KnYC4sZlr80GJ4l1Cp+4Q0101q6WeZRjMCAwEAAaNFMEMwIgYDVR0R
+BBswGYIXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQwHQYDVR0OBBYEFHzZ8nn/1Zj8
+kxrK0kLw3RlA/t9hMA0GCSqGSIb3DQEBCwUAA4IBgQCAOrmhhFLsfqYx6K+wKt7I
+HCqbsB0bhM8pccqWmUaUWP1WlRJOupIpOmP5FvIgvVtXsuEzUKd1voPF4DMfzaV6
+ACU6DxLf0lZ/3NrwM9ipVEE/zpXMHvBTn5802wcOIIm7hF+If83QM79ogex6b7gW
+oLhWfu1yz+2La4twB+6zkcz9THgkgSn0UtUNwd0HzyyHZ3SZuOMCGUIuyz+19c1n
++KX6CjsXpMcJ4Oc1HsbtCKNkvEwNudxeiXWSWzj5MQHMcALE/ybOiQ/NMmj5SUzt
+oySXpA6JvX5PwGbuyuy1j4u6gwunYWXWzA0/bEyYADM47ZfNhzD+52b3sVaM1ROB
+TFv0Jq/k9XzQGKyrxphatYKLFZZ92DBDrtnwE3YsIXYc8qzWV7fDbSdvJe6eRBJV
+nnp6KW+OGs5W4irV/BM+AE0LMh7hb4xWfN1xO8Z2nrgAWHNJUkFw74FkEa94t9Y4
+KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
+</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://prestaging.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prestaging.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/staging.cloudmore.com-shibboleth.xml b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
new file mode 100644
index 00000000..57237d65
--- /dev/null
+++ b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://staging.cloudmore.com/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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"/>
+  </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://staging.cloudmore.com/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://staging.cloudmore.com/Shibboleth.sso/Login" index="1"/>
+      <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://staging.cloudmore.com/Shibboleth.sso/Login" index="2"/>
+      <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://staging.cloudmore.com/Shibboleth.sso/Login" index="3"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
+        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>stoprvfe01.domain01.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=stoprvfe01.domain01.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAJOLmVdtpocoMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMTF3N0b3BydmZlMDEuZG9tYWluMDEubmV0MB4XDTE3MDkwNTE5MDYyN1oXDTI3
+MDkwMzE5MDYyN1owIjEgMB4GA1UEAxMXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQw
+ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4YLswQuTzT9JcYWFe8PFZ
+oR/liIkoELde+7fJquGIUps2PflaSFcb8qf8LFik8OqB/WI3d1+ORN6S7TDrXbUN
+S+TNz4ngmc+qw3FQrHooleAgciPUpvA68g7qHGEjqqC4MggOWf31da7ICgpl+j8L
+rCdGWk0ea4rgH9KT9iercYdJfk41dS6VkwT2ARQVignuDMkqOV9BlR3fEyKFz7VL
+Kc+zYz0vtcSMIx85BffZ24oMbETeJkRCFUMqGkagsf/KKeTVRCbEnOosWYsac/Lj
+xQxFD+aKaKP5z6Wvd9EDKAa5egS5m556z58LUiUXT4QcRqc43OTcoI1OefeQT+B7
+0chHWZRXGzZWxNsDgbjUhBLcELh1H9ehc99TaNIXeIyYJgfZp2zXAsE8UGUqpL5p
+JI+OG/7au2kVipcQqbiMxYm+FhyLqzgRhNQrP4wXPee9Psyvy0ylIwveUY83uwBV
+EsAiyg6LD3KnYC4sZlr80GJ4l1Cp+4Q0101q6WeZRjMCAwEAAaNFMEMwIgYDVR0R
+BBswGYIXc3RvcHJ2ZmUwMS5kb21haW4wMS5uZXQwHQYDVR0OBBYEFHzZ8nn/1Zj8
+kxrK0kLw3RlA/t9hMA0GCSqGSIb3DQEBCwUAA4IBgQCAOrmhhFLsfqYx6K+wKt7I
+HCqbsB0bhM8pccqWmUaUWP1WlRJOupIpOmP5FvIgvVtXsuEzUKd1voPF4DMfzaV6
+ACU6DxLf0lZ/3NrwM9ipVEE/zpXMHvBTn5802wcOIIm7hF+If83QM79ogex6b7gW
+oLhWfu1yz+2La4twB+6zkcz9THgkgSn0UtUNwd0HzyyHZ3SZuOMCGUIuyz+19c1n
++KX6CjsXpMcJ4Oc1HsbtCKNkvEwNudxeiXWSWzj5MQHMcALE/ybOiQ/NMmj5SUzt
+oySXpA6JvX5PwGbuyuy1j4u6gwunYWXWzA0/bEyYADM47ZfNhzD+52b3sVaM1ROB
+TFv0Jq/k9XzQGKyrxphatYKLFZZ92DBDrtnwE3YsIXYc8qzWV7fDbSdvJe6eRBJV
+nnp6KW+OGs5W4irV/BM+AE0LMh7hb4xWfN1xO8Z2nrgAWHNJUkFw74FkEa94t9Y4
+KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
+</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://staging.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index f2a07d87..30cf3747 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -28,4 +28,9 @@
   <xi:include href="swamid-2.0/graylog.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml"/>
+  <xi:include href="swamid-2.0/prestaging.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/staging.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 83725ee5..1fb6a5ad 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -666,7 +666,11 @@
   <xi:include href="swamid-2.0/portaluu.onricoh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml"/>
   <xi:include href="swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml"/>
-  <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/almagest.sai.kau.se.xml"/>
   <xi:include href="swamid-2.0/pingpong.hj.se-Shibboleth.sso-Metadata.xml"/>
+  <xi:include href="swamid-2.0/prestaging.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/staging.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3


From f8ae2497855294b3ba7fa583312a23f781aee7de Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 19 Sep 2017 11:53:09 +0200
Subject: Resolves SWAMIDOPS-195 again

---
 swamid-2.0/cloudmore.com-shibboleth.xml            |  2 +-
 swamid-2.0/dev.cloudmore.com-shibboleth.xml        |  2 +-
 swamid-2.0/local.cloudmore.com-shibboleth.xml      | 26 +++++++++++-----------
 swamid-2.0/prestaging.cloudmore.com-shibboleth.xml |  2 +-
 swamid-2.0/staging.cloudmore.com-shibboleth.xml    |  2 +-
 swamid-edugain-sp-1.0.mxml                         |  5 +++++
 swamid-sp-2.0.mxml                                 |  6 -----
 7 files changed, 22 insertions(+), 23 deletions(-)

(limited to 'swamid-2.0/local.cloudmore.com-shibboleth.xml')

diff --git a/swamid-2.0/cloudmore.com-shibboleth.xml b/swamid-2.0/cloudmore.com-shibboleth.xml
index 2010b8f1..8d032f49 100644
--- a/swamid-2.0/cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/cloudmore.com-shibboleth.xml
@@ -29,7 +29,7 @@
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/dev.cloudmore.com-shibboleth.xml b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
index 98f7e3f0..46f05471 100644
--- a/swamid-2.0/dev.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
@@ -26,7 +26,7 @@
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/local.cloudmore.com-shibboleth.xml b/swamid-2.0/local.cloudmore.com-shibboleth.xml
index 7709c982..23fd055c 100644
--- a/swamid-2.0/local.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/local.cloudmore.com-shibboleth.xml
@@ -20,13 +20,13 @@
   </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="http://local.cloudmore.com/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="http://local.cloudmore.com/Shibboleth.sso/Login" 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://local.cloudmore.com/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://local.cloudmore.com/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -69,16 +69,16 @@ f49DvQ516YA=
       <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="http://local.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://local.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://local.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://local.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://local.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://local.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://local.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://local.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://local.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://local.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
diff --git a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
index 865eafc3..e4574ce6 100644
--- a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
@@ -27,7 +27,7 @@
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/staging.cloudmore.com-shibboleth.xml b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
index 57237d65..e489216f 100644
--- a/swamid-2.0/staging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
@@ -28,7 +28,7 @@
         <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
         <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
-        <mdui:Logo height="300" width="300">http://web.cloudmore.com/hubfs/images/icons/Cloudmore-green-icon.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index c55e65f2..479ef025 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -29,4 +29,9 @@
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml"/>
   <xi:include href="swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml"/>
+  <xi:include href="swamid-2.0/prestaging.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/staging.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9185ea6f..2f63ee3e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -668,12 +668,6 @@
   <xi:include href="swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/almagest.sai.kau.se.xml"/>
   <xi:include href="swamid-2.0/pingpong.hj.se-Shibboleth.sso-Metadata.xml"/>
-  <xi:include href="swamid-2.0/prestaging.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/staging.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/redcap.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/redcap.tst.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3