From 5085b953702edc2649ffe6a66c603bfc93601056 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Mon, 7 May 2018 14:48:15 +0200
Subject: Resolved SWAMID-660

---
 swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml |  96 ++++++++++++++++++++
 swamid-2.0/websrv01.testad.umu.se-shibboleth.xml  | 101 ----------------------
 2 files changed, 96 insertions(+), 101 deletions(-)
 create mode 100644 swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml
 delete mode 100644 swamid-2.0/websrv01.testad.umu.se-shibboleth.xml

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml b/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..dc6afde3
--- /dev/null
+++ b/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lis.ladok.test.sunet.se/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"/>
+    <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol 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://lis.ladok.test.sunet.se/Shibboleth.sso/DS/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://lis.ladok.test.sunet.se/Shibboleth.sso/DS/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://lis.ladok.test.sunet.se/Shibboleth.sso/Loginx"/>
+      <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://lis.ladok.test.sunet.se/Shibboleth.sso/UMU"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Testsystem för canvas-lis vid Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Testsystem for canvas-lis at Umea University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Logsystem</mdui:Description>
+        <mdui:Description xml:lang="en">Logsystem</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>administrationsverktyg.test.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=administrationsverktyg.test.umu.se,OU=umea,O=umea university,L=umea,ST=umea,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIJAKL7VKLHsFrNMA0GCSqGSIb3DQEBCwUAMIGmMQswCQYD
+VQQGEwJTRTENMAsGA1UECBMEdW1lYTENMAsGA1UEBxMEdW1lYTEYMBYGA1UEChMP
+dW1lYSB1bml2ZXJzaXR5MQ0wCwYDVQQLEwR1bWVhMSswKQYDVQQDEyJhZG1pbmlz
+dHJhdGlvbnN2ZXJrdHlnLnRlc3QudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0b21t
+eS5sYXJzc29uQHVtdS5zZTAeFw0xNzExMjcwODQ5MTBaFw0yMDEwMTAwODQ5MTBa
+MIGmMQswCQYDVQQGEwJTRTENMAsGA1UECBMEdW1lYTENMAsGA1UEBxMEdW1lYTEY
+MBYGA1UEChMPdW1lYSB1bml2ZXJzaXR5MQ0wCwYDVQQLEwR1bWVhMSswKQYDVQQD
+EyJhZG1pbmlzdHJhdGlvbnN2ZXJrdHlnLnRlc3QudW11LnNlMSMwIQYJKoZIhvcN
+AQkBFhR0b21teS5sYXJzc29uQHVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMN/TG2G/mR5fwYMt3NMCjVglJngNHdTkn4sy5sm+TyPwbpw+VnW
+rLuWAXXcxfJsXxrcvatm1yAcaGNp6rNdV2RzjvH8EGccVvtLJJ+WEkDN4bFAgOdj
+AMmww+Ngo6NBIS6Ubgobsw2mTWTYTW6OAJtCvbmrSu4lqXPNE71r8xGUL+o1uRSU
+ce8XKMtDwc4sdfhZ1W4tfOCylo2bf4vsGsXzcrX1LSDXzL3BeX1I7Y0iamDtb7XG
+73NjmQbzRR2k5yKDub6cV6tcYwNdi6XrfZCwPh74ckHOHd1FVmDte1Q1Eat1Hl9x
+n2W9pZU9RnwSlCFWAzsR5Wif24CA8+ibSuECAwEAAaOCAQ8wggELMB0GA1UdDgQW
+BBTHEM9WLxGI+YKRncZCAqo0DNBM0jCB2wYDVR0jBIHTMIHQgBTHEM9WLxGI+YKR
+ncZCAqo0DNBM0qGBrKSBqTCBpjELMAkGA1UEBhMCU0UxDTALBgNVBAgTBHVtZWEx
+DTALBgNVBAcTBHVtZWExGDAWBgNVBAoTD3VtZWEgdW5pdmVyc2l0eTENMAsGA1UE
+CxMEdW1lYTErMCkGA1UEAxMiYWRtaW5pc3RyYXRpb25zdmVya3R5Zy50ZXN0LnVt
+dS5zZTEjMCEGCSqGSIb3DQEJARYUdG9tbXkubGFyc3NvbkB1bXUuc2WCCQCi+1Si
+x7BazTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBfAaJLkf7Jw3dA
+hYkPxBaacrZoEDnMWvBskjN3K2rXvaX/4lNO5fUPmn0Fa3XGboEujzkfVbPA8yum
+q3Uo+VETtDoX/t6t4/E2lmC/ceSDP3i26QS4I9rE8dAu2wa1lAZN8rGDQzUeLFbM
+nEwOTYTTy3bWuySCHbAcLFoRbAEQmRvlPk/sWU9cCUaLmTxRVkmr1s1UbZJNVPhX
+rNkzHliVfNgyZqak7Ay9DNyx8hSt/1/CBfgQsPjOLxpyKxGIdME86uCTbe32i9mz
+1F4EXgMOYoaMf/hN6D9Jrvxz26240P577lU5lbkmyI/OrV8zIc+XYMC7wune5hNz
+0/bNyIzo
+					</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://lis.ladok.test.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/POST" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/websrv01.testad.umu.se-shibboleth.xml b/swamid-2.0/websrv01.testad.umu.se-shibboleth.xml
deleted file mode 100644
index 12f98cfc..00000000
--- a/swamid-2.0/websrv01.testad.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://websrv01.testad.umu.se/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"/>
-    <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol 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://websrv01.testad.umu.se/Shibboleth.sso/DS/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://websrv01.testad.umu.se/Shibboleth.sso/DS/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://websrv01.testad.umu.se/Shibboleth.sso/Loginx"/>
-      <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://websrv01.testad.umu.se/Shibboleth.sso/UMU"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Testsystem för canvas-lis vid Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Testsystem for canvas-lis at Umea University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Logsystem</mdui:Description>
-        <mdui:Description xml:lang="en">Logsystem</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>administrationsverktyg.test.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=administrationsverktyg.test.umu.se,OU=umea,O=umea university,L=umea,ST=umea,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIJAKL7VKLHsFrNMA0GCSqGSIb3DQEBCwUAMIGmMQswCQYD
-VQQGEwJTRTENMAsGA1UECBMEdW1lYTENMAsGA1UEBxMEdW1lYTEYMBYGA1UEChMP
-dW1lYSB1bml2ZXJzaXR5MQ0wCwYDVQQLEwR1bWVhMSswKQYDVQQDEyJhZG1pbmlz
-dHJhdGlvbnN2ZXJrdHlnLnRlc3QudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0b21t
-eS5sYXJzc29uQHVtdS5zZTAeFw0xNzExMjcwODQ5MTBaFw0yMDEwMTAwODQ5MTBa
-MIGmMQswCQYDVQQGEwJTRTENMAsGA1UECBMEdW1lYTENMAsGA1UEBxMEdW1lYTEY
-MBYGA1UEChMPdW1lYSB1bml2ZXJzaXR5MQ0wCwYDVQQLEwR1bWVhMSswKQYDVQQD
-EyJhZG1pbmlzdHJhdGlvbnN2ZXJrdHlnLnRlc3QudW11LnNlMSMwIQYJKoZIhvcN
-AQkBFhR0b21teS5sYXJzc29uQHVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMN/TG2G/mR5fwYMt3NMCjVglJngNHdTkn4sy5sm+TyPwbpw+VnW
-rLuWAXXcxfJsXxrcvatm1yAcaGNp6rNdV2RzjvH8EGccVvtLJJ+WEkDN4bFAgOdj
-AMmww+Ngo6NBIS6Ubgobsw2mTWTYTW6OAJtCvbmrSu4lqXPNE71r8xGUL+o1uRSU
-ce8XKMtDwc4sdfhZ1W4tfOCylo2bf4vsGsXzcrX1LSDXzL3BeX1I7Y0iamDtb7XG
-73NjmQbzRR2k5yKDub6cV6tcYwNdi6XrfZCwPh74ckHOHd1FVmDte1Q1Eat1Hl9x
-n2W9pZU9RnwSlCFWAzsR5Wif24CA8+ibSuECAwEAAaOCAQ8wggELMB0GA1UdDgQW
-BBTHEM9WLxGI+YKRncZCAqo0DNBM0jCB2wYDVR0jBIHTMIHQgBTHEM9WLxGI+YKR
-ncZCAqo0DNBM0qGBrKSBqTCBpjELMAkGA1UEBhMCU0UxDTALBgNVBAgTBHVtZWEx
-DTALBgNVBAcTBHVtZWExGDAWBgNVBAoTD3VtZWEgdW5pdmVyc2l0eTENMAsGA1UE
-CxMEdW1lYTErMCkGA1UEAxMiYWRtaW5pc3RyYXRpb25zdmVya3R5Zy50ZXN0LnVt
-dS5zZTEjMCEGCSqGSIb3DQEJARYUdG9tbXkubGFyc3NvbkB1bXUuc2WCCQCi+1Si
-x7BazTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBfAaJLkf7Jw3dA
-hYkPxBaacrZoEDnMWvBskjN3K2rXvaX/4lNO5fUPmn0Fa3XGboEujzkfVbPA8yum
-q3Uo+VETtDoX/t6t4/E2lmC/ceSDP3i26QS4I9rE8dAu2wa1lAZN8rGDQzUeLFbM
-nEwOTYTTy3bWuySCHbAcLFoRbAEQmRvlPk/sWU9cCUaLmTxRVkmr1s1UbZJNVPhX
-rNkzHliVfNgyZqak7Ay9DNyx8hSt/1/CBfgQsPjOLxpyKxGIdME86uCTbe32i9mz
-1F4EXgMOYoaMf/hN6D9Jrvxz26240P577lU5lbkmyI/OrV8zIc+XYMC7wune5hNz
-0/bNyIzo
-</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://websrv01.testad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML2/POST" index="10"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tommy</md:GivenName>
-    <md:SurName>Larsson</md:SurName>
-    <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
-- 
cgit v1.2.3