SWAMID-2006: Updated ths.instructure.com

1 files changed, 7 insertions, 56 deletions

diff --git a/swamid-2.0/ths.instructure.com-saml2.xml b/swamid-2.0/ths.instructure.com-saml2.xml
index e6344f1f..abefa2c3 100644
--- a/swamid-2.0/ths.instructure.com-saml2.xml
+++ b/swamid-2.0/ths.instructure.com-saml2.xml
@@ -8,7 +8,7 @@
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -21,70 +21,21 @@
         <mdui:Description xml:lang="en">Canvas is the virtual learning environment at University College Stockholm</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.ehs.se/english</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.ehs.se/om-hogskolan</mdui:InformationURL>
-        <mdui:Logo height="46" width="192" xml:lang="sv">https://www.canvaslms.com/img/logo/instructure.png</mdui:Logo>
-        <mdui:Logo height="46" width="192" xml:lang="en">https://www.canvaslms.com/img/logo/instructure.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://idp.ths.se/idp/privacy_policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://idp.ths.se/idp/privacy_policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
-IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE3MDQwODIxMDQwNVoXDTE5MDQyMjIx
-MDQwNVowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CwwKT3BlcmF0aW9uczEgMB4GA1UEAwwXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOokl8TPWm4LL6rqEnPjL0t5QWw76WOTA9JzLJ
-xjKwtIWlGAlyRQ+gEmD5vaFAzoYl62BIm2yCy+EdUR9D/3X9Hq+22ysy7pWj8rda
-JeQ1XAX2xMlphZhMHnKdKBfDxLMaIEKQg942xBTkY3yeDsc8YezR0sSBToumQs23
-PVnIq7u1U+UAry0Q33ovmJRV50kQk3Qccl6omSDXezUIB+LYqI2ghoIo/+XfHaPe
-pHWj3XnXKBGtlDIpUbgVIbqdHcsE9uRHK6YfeiWqX+fW0h8rcn5z3cj5awzYJ8kk
-GKACS6TNccfFCouMoKskBB4ot2WBuIKEyJNqg7kn/wlCzsoHAgMBAAGjUDBOMB0G
-A1UdDgQWBBQ3lOrDsVPyDFZyZhjbbLZpdStYODAfBgNVHSMEGDAWgBQ3lOrDsVPy
-DFZyZhjbbLZpdStYODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBy
-mkrTdaGCS5wSswAKwHmrTdZQdD4ksXszvQKZEiLtenoDyE7JomCME1a5BaGuDjaD
-BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
-XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
-1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
-Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ ARYTb3BzQGluc3RydWN0dXJlLmNvbTAeFw0xOTAzMjExNTM5MDRaFw0yOTAzMTgx NTM5MDRaMIGsMQswCQYDVQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwO U2FsdCBMYWtlIENpdHkxGjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYD VQQLDApPcGVyYXRpb25zMSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0 ZTEiMCAGCSqGSIb3DQEJARYTb3BzQGluc3RydWN0dXJlLmNvbTCCASIwDQYJKoZI hvcNAQEBBQADggEPADCCAQoCggEBAPXoYCW9QPrtfn0+WLX43YtM89gLHrnSM0rR Tc+0DQ9TUZKKrma80XvwOS3K0hjf7k+mAlarYptwXuPOaS6+LMRgxBRx/iWdugKr yWKpwbzZ13v1TnLZ1rc6ThyRuilvKIPD7dP3rv+A1EzYYk9ZGtd5gFSBUtUqFwj1 76CUaEjCIN8FaogbbppWi/C1kWtPvPY+UeZ4IBJUpj+ect8rbhdVq5FxDErRdAzH CIi6xSqlLqmV13rqD4srMtE98d+9Ki2hat3yNz3mmb5aZdiLQk6DosfQmHfNy6JS GyVwmAZOPB5ssFuNfQZFK9o6WG5umS/aEN/ssfW/7uM9TDkkKvsCAwEAAaNTMFEw HQYDVR0OBBYEFAraQ0414RyifBPG9LflNTiVFF7fMB8GA1UdIwQYMBaAFAraQ041 4RyifBPG9LflNTiVFF7fMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD ggEBAA+AaM/dPLidoPNJlKj9zQ9aTvJIF7MQhfrNkeNkMpGmE0igyZFq6z2WuA5u U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
-      </md:EncryptionMethod>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
-IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE3MDQwODIxMDQwNVoXDTE5MDQyMjIx
-MDQwNVowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CwwKT3BlcmF0aW9uczEgMB4GA1UEAwwXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOokl8TPWm4LL6rqEnPjL0t5QWw76WOTA9JzLJ
-xjKwtIWlGAlyRQ+gEmD5vaFAzoYl62BIm2yCy+EdUR9D/3X9Hq+22ysy7pWj8rda
-JeQ1XAX2xMlphZhMHnKdKBfDxLMaIEKQg942xBTkY3yeDsc8YezR0sSBToumQs23
-PVnIq7u1U+UAry0Q33ovmJRV50kQk3Qccl6omSDXezUIB+LYqI2ghoIo/+XfHaPe
-pHWj3XnXKBGtlDIpUbgVIbqdHcsE9uRHK6YfeiWqX+fW0h8rcn5z3cj5awzYJ8kk
-GKACS6TNccfFCouMoKskBB4ot2WBuIKEyJNqg7kn/wlCzsoHAgMBAAGjUDBOMB0G
-A1UdDgQWBBQ3lOrDsVPyDFZyZhjbbLZpdStYODAfBgNVHSMEGDAWgBQ3lOrDsVPy
-DFZyZhjbbLZpdStYODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBy
-mkrTdaGCS5wSswAKwHmrTdZQdD4ksXszvQKZEiLtenoDyE7JomCME1a5BaGuDjaD
-BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
-XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
-1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
-Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ ARYTb3BzQGluc3RydWN0dXJlLmNvbTAeFw0xOTAzMjExNTM5MDRaFw0yOTAzMTgx NTM5MDRaMIGsMQswCQYDVQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwO U2FsdCBMYWtlIENpdHkxGjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYD VQQLDApPcGVyYXRpb25zMSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0 ZTEiMCAGCSqGSIb3DQEJARYTb3BzQGluc3RydWN0dXJlLmNvbTCCASIwDQYJKoZI hvcNAQEBBQADggEPADCCAQoCggEBAPXoYCW9QPrtfn0+WLX43YtM89gLHrnSM0rR Tc+0DQ9TUZKKrma80XvwOS3K0hjf7k+mAlarYptwXuPOaS6+LMRgxBRx/iWdugKr yWKpwbzZ13v1TnLZ1rc6ThyRuilvKIPD7dP3rv+A1EzYYk9ZGtd5gFSBUtUqFwj1 76CUaEjCIN8FaogbbppWi/C1kWtPvPY+UeZ4IBJUpj+ect8rbhdVq5FxDErRdAzH CIi6xSqlLqmV13rqD4srMtE98d+9Ki2hat3yNz3mmb5aZdiLQk6DosfQmHfNy6JS GyVwmAZOPB5ssFuNfQZFK9o6WG5umS/aEN/ssfW/7uM9TDkkKvsCAwEAAaNTMFEw HQYDVR0OBBYEFAraQ0414RyifBPG9LflNTiVFF7fMB8GA1UdIwQYMBaAFAraQ041 4RyifBPG9LflNTiVFF7fMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD ggEBAA+AaM/dPLidoPNJlKj9zQ9aTvJIF7MQhfrNkeNkMpGmE0igyZFq6z2WuA5u U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -100,8 +51,8 @@ SQJDMGy5cRRcanOu2OwE</ds:X509Certificate>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">EHS</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">UCS</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Enskilda Högskolan Stockholm</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University College Stockholm</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Enskilda Högskolan Stockholm</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University College Stockholm</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ehs.se/</md:OrganizationURL>