Resolves SWAMIDOPS-8311

1 files changed, 156 insertions, 58 deletions

diff --git a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
index fbbe4fd5..b239d6ea 100644
--- a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
@@ -1,38 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shib-idp-test.oru.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://shib-idp-test.oru.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">shib-idp-test.oru.se</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test-IdP för Örebro universitet - Shibboleth IdP v3.2.1</mdui:Description>
+        <mdui:Logo height="80" width="80">https://shib-idp-test.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
+      </mdui:UIInfo>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUL1hPQSOLEeBRuotYMymZxMfs+NEwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTAwNDE5MTEw
-NjM2WhcNMzAwNDE5MTEwNjM2WjAfMR0wGwYDVQQDExRzaGliLWlkcC10ZXN0Lm9y
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALts6ImCj550QsZC
-XZKfS0Id5pK3v9rRTSNs6em5F5kR1YLSpNjNmDh7Ly0VM2tHdvF07aQ+0db/lL/C
-1I4w8CjapJl7FtrZR7m5p0MSzoFZD6YO9bdVPx5fXTibUV1pmHOQwzTwvzpKwK7b
-teVTxm5AbZv4MIdHkCruL+j3ULs5Av70AEZqYLZrDsZB4jRj5lrEU3TKWGR9hogt
-FR7mwF29CAyBozOREGtlnyh6dpiPNbEyYogXYHEiO01fuA9YCbjKkLbT6JihZ1Sr
-pulCuNRpSRobmTXx3dqNSEKAtwCPhkACpSjxLRhWhiz/yCTq2Gtnfj/AJ8LbN82d
-ub0uVqcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYi1pZHAtdGVzdC5vcnUuc2WG
-K2h0dHBzOi8vc2hpYi1pZHAtdGVzdC5vcnUuc2UvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFNCO/POVajXZInMq3ou0SdInZHIVMA0GCSqGSIb3DQEBBQUAA4IBAQCw
-vt65eqgtN1+QFyq5dmVXZ6LtggHupoVsYMtwS1hxDqsogsMBG8Q8HKZTSOIHxOJZ
-PwCTZuP93xWqa5r0D4w8W/4FxhpR3gnBzF9KSLSJ+zb99+f/6oxpTMMIcQjear+8
-Dp+2X1kVXtrJ8jhI0/ZDyAEYDv9OB5fLWjg7PworfuOm+bcYUXxdyTstkuMqaKuY
-LkDtPwQOSlQTw2opovGRVI7hHT89tkL3LY53RHSOz3T08J8PrWuggUO3zcpIfIGa
-tOfpY/N/6jk7YXOOupxcZTjF1ye+MntF2bXP1MWc90HUeaWfsrT7OWOplJIZ0vbV
-vs6Y0aXUmx4uTVjZQtbc
-
-                    </ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUNiSfKA1z7kqPZnZ6BvFj5alpNDgwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
+OTU3WhcNMzYwOTAxMTI0OTU3WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4xgsKQJZUjQQ/2
+w6IMXPyTzSsMlzAyLlb8U5NvskAV9Cy5MlfCn9az4XqR2rm/4FHblwETi2PuMpW1
+qy1DSDA3dL8zWunDuz8J+FhGvSd7xmTnQaOYp5Klqpm2hKUTNUPGPNyCBIOB8iB2
+iKVnTRmThzvr3yOTA0zFrwZZ177DQhkhbP2g/iqBscxYMes7CSNXeFTaI1dksIpi
+3uy2GcNCxDI6khYGC9YT0rcU9eLFQ+gP6hdVZcrPcjPC4J/u6D1YcwC2G7RCNCBp
+up9V0pcCRrcBoo/LJIghfGBat0hKTFUtxK/6GBX1gcrVqTvjBeQXJPqWpzL4qtkT
+/QuYhoMCAwEAAaNvMG0wHQYDVR0OBBYEFBEX0552+o8uctBk5u7x49By+jU8MEwG
+A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
+LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBT
+5WCk9TSGTsQNVvuz7zgqBsTasmc7cI6EjqWyhilonfT2orbnZG5+4zOyJnfYF8W3
+OO84YZSY+XozxZfz1sEaGQheiExJVpMfF7fNKr53jNTw8jcOcgSo4ThOfXSf37q9
+jmfLTiubpqiBpKxWhVvyhZEeDyROCli+3JKfomBO6jVBFs5xeYmuj/LCgavAvdBN
+iZ0aXelhNSJeuPksLkSy2zAWHB9Y+lUYCVZ+0ACFGbtruHUW3L5WSchE5d+KXDZ8
+25H2L/qtUpsi4735GVsBKieHohtT61Un0XKeSwEhWSX+ej5DbgzXH6F7XbMS6+RD
+WVSpbBf+Iky5/3hSJbjO
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAM531TMg36on8Ql5UK2TziTQr9qRMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFHNoaWItaWRwLXRlc3Qub3J1LnNlMB4XDTE2MDkwMTEy
+NDk1NloXDTM2MDkwMTEyNDk1NlowHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5v
+cnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmyj1MWgE8NgPY
+tb3XsakHcEOrk6o79EDWTx6DtdTJfz9L2Nl7Z6K/oUZ0R3v1kT8zncS3uz5AlcM0
+vepZ9d4dLWXwKrmOcMTZlRoyQd8RlaC1X3kMinkpivkXduignD/pQter2pCLdoFT
+j0oKbmSHR130zm/uaigcPYjyqwPD/yuwE5mZ+sX1j0NrRU9pvMDZmrgU1XeNwLLD
+wBoCi8qedjGupkJCpvU4X/3+CvVYtzuEImBQmhDnvNpPk1UX6h8wFwNzWr9mkmIl
+qJ9HhakzkbDblsOOgSu+GkGEVaDTFLkoOKxVD8ohqfpYMmNWpCnHvICfbx+qyubx
+Y9qMQUTlAgMBAAGjbzBtMB0GA1UdDgQWBBS6hqhPe57NQMnrUyoK29RDzi4kQDBM
+BgNVHREERTBDghRzaGliLWlkcC10ZXN0Lm9ydS5zZYYraHR0cHM6Ly9zaGliLWlk
+cC10ZXN0Lm9ydS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+Px98VAMrQj/axaEDyVWI+KmXV5JvM5CzJZV2Tt1QZAKG2D1qK/B8Kpri6tFLCK8S
+7cWdzU63gGaP5wONW1rD7uG2bCYlKkiEnJDafapKlS0/qJF2FNA1/6rEDOibwdT6
+yib8RrjklowyQ0pwAMm+YJ89n/MqB5SOL8jPjJEib83FZruRgTg2npKPkc7eWy6l
+XRk4jFV8NbemfAY/9o/JbecRM70stqFI0ihYPg8N7MPyB5Tr5w5OLaqRsEB+qyIy
+AqkS4O7+sMfqyRZz4qH/8s3MKspUmr7LncvBKSWOINun9P2gTJuqqOrJKg7wDHgL
+BAZNocu/Hh/kGS7R/8vneg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUOIOR9/vOXSKitXIAEB1uhk5hRFcwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
+OTU2WhcNMzYwOTAxMTI0OTU2WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVY4Vj+DCdA1Igb
+yz2UPXyniLHv61Q05LvG/1ECyuu79/Qr0B/f8IyKM+S+PiXXm7QlQAmfXWdLRd5e
+LuVUGNjXvBuDava+2yruoHY3Ay5DtmZQ0wpmK8NPRCO647G4dC+viY4lcWZtqIDR
+2mME4w+XBVZYVi3blrG99DqAIxEhN5JPJ1zqas/6JsaoMYvrS4cq5iwe5vubG6oP
+8wR2J8bfRSuLNHlBkhlctzzDsq6TG8gPajsP29nkIp7m6HKTKlsDyf+w/GdnxF+2
+pbOz3/jh/ET0+OB+eL+FO/f3EUF5WH/8pP3SkQRhWqrDeBxEXyFIB0kN6E4RKKBG
+Rhf/5KkCAwEAAaNvMG0wHQYDVR0OBBYEFImydoN/TfZT6En7jgsKNZTGro57MEwG
+A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
+LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAY
+874Wa9Z1g3WnpAOWinjjddVhnJ7B0GLMCasK7ctE74ax4kUcJKWxFjkIcF+6Pqwd
+KwVjBpDVsKGTEG5kb2cVZ1UKcoLo9PWMPuu0vHD4J4nWxciYWaZAgZgmEChRSllg
+afhj274z9wVMQMalKZr6aMw+nqxOxuDMVZFI3eJsDbpnZX7zl8RWwDhd6p+cSG+L
+nqC6xm+7gvxNFRxFh+Rb9I5h4JTSw65XLPfW+Tr3tVwJfWGrwDCLTx5QAC3yPDsZ
+LMTMMpgfHF1hgt28TdVQwk+pE0VqHUjouPIEUhFjaPpMWPiEpTjdyQFv4PDsE6lR
+d3hB7quCN72lcAz/8iZU
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/SLO"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-test.oru.se/idp/profile/Shibboleth/SSO"/>
@@ -40,55 +100,93 @@ vs6Y0aXUmx4uTVjZQtbc
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-test.oru.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUNiSfKA1z7kqPZnZ6BvFj5alpNDgwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
+OTU3WhcNMzYwOTAxMTI0OTU3WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4xgsKQJZUjQQ/2
+w6IMXPyTzSsMlzAyLlb8U5NvskAV9Cy5MlfCn9az4XqR2rm/4FHblwETi2PuMpW1
+qy1DSDA3dL8zWunDuz8J+FhGvSd7xmTnQaOYp5Klqpm2hKUTNUPGPNyCBIOB8iB2
+iKVnTRmThzvr3yOTA0zFrwZZ177DQhkhbP2g/iqBscxYMes7CSNXeFTaI1dksIpi
+3uy2GcNCxDI6khYGC9YT0rcU9eLFQ+gP6hdVZcrPcjPC4J/u6D1YcwC2G7RCNCBp
+up9V0pcCRrcBoo/LJIghfGBat0hKTFUtxK/6GBX1gcrVqTvjBeQXJPqWpzL4qtkT
+/QuYhoMCAwEAAaNvMG0wHQYDVR0OBBYEFBEX0552+o8uctBk5u7x49By+jU8MEwG
+A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
+LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBT
+5WCk9TSGTsQNVvuz7zgqBsTasmc7cI6EjqWyhilonfT2orbnZG5+4zOyJnfYF8W3
+OO84YZSY+XozxZfz1sEaGQheiExJVpMfF7fNKr53jNTw8jcOcgSo4ThOfXSf37q9
+jmfLTiubpqiBpKxWhVvyhZEeDyROCli+3JKfomBO6jVBFs5xeYmuj/LCgavAvdBN
+iZ0aXelhNSJeuPksLkSy2zAWHB9Y+lUYCVZ+0ACFGbtruHUW3L5WSchE5d+KXDZ8
+25H2L/qtUpsi4735GVsBKieHohtT61Un0XKeSwEhWSX+ej5DbgzXH6F7XbMS6+RD
+WVSpbBf+Iky5/3hSJbjO
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAM531TMg36on8Ql5UK2TziTQr9qRMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFHNoaWItaWRwLXRlc3Qub3J1LnNlMB4XDTE2MDkwMTEy
+NDk1NloXDTM2MDkwMTEyNDk1NlowHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5v
+cnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmyj1MWgE8NgPY
+tb3XsakHcEOrk6o79EDWTx6DtdTJfz9L2Nl7Z6K/oUZ0R3v1kT8zncS3uz5AlcM0
+vepZ9d4dLWXwKrmOcMTZlRoyQd8RlaC1X3kMinkpivkXduignD/pQter2pCLdoFT
+j0oKbmSHR130zm/uaigcPYjyqwPD/yuwE5mZ+sX1j0NrRU9pvMDZmrgU1XeNwLLD
+wBoCi8qedjGupkJCpvU4X/3+CvVYtzuEImBQmhDnvNpPk1UX6h8wFwNzWr9mkmIl
+qJ9HhakzkbDblsOOgSu+GkGEVaDTFLkoOKxVD8ohqfpYMmNWpCnHvICfbx+qyubx
+Y9qMQUTlAgMBAAGjbzBtMB0GA1UdDgQWBBS6hqhPe57NQMnrUyoK29RDzi4kQDBM
+BgNVHREERTBDghRzaGliLWlkcC10ZXN0Lm9ydS5zZYYraHR0cHM6Ly9zaGliLWlk
+cC10ZXN0Lm9ydS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+Px98VAMrQj/axaEDyVWI+KmXV5JvM5CzJZV2Tt1QZAKG2D1qK/B8Kpri6tFLCK8S
+7cWdzU63gGaP5wONW1rD7uG2bCYlKkiEnJDafapKlS0/qJF2FNA1/6rEDOibwdT6
+yib8RrjklowyQ0pwAMm+YJ89n/MqB5SOL8jPjJEib83FZruRgTg2npKPkc7eWy6l
+XRk4jFV8NbemfAY/9o/JbecRM70stqFI0ihYPg8N7MPyB5Tr5w5OLaqRsEB+qyIy
+AqkS4O7+sMfqyRZz4qH/8s3MKspUmr7LncvBKSWOINun9P2gTJuqqOrJKg7wDHgL
+BAZNocu/Hh/kGS7R/8vneg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUL1hPQSOLEeBRuotYMymZxMfs+NEwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTAwNDE5MTEw
-NjM2WhcNMzAwNDE5MTEwNjM2WjAfMR0wGwYDVQQDExRzaGliLWlkcC10ZXN0Lm9y
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALts6ImCj550QsZC
-XZKfS0Id5pK3v9rRTSNs6em5F5kR1YLSpNjNmDh7Ly0VM2tHdvF07aQ+0db/lL/C
-1I4w8CjapJl7FtrZR7m5p0MSzoFZD6YO9bdVPx5fXTibUV1pmHOQwzTwvzpKwK7b
-teVTxm5AbZv4MIdHkCruL+j3ULs5Av70AEZqYLZrDsZB4jRj5lrEU3TKWGR9hogt
-FR7mwF29CAyBozOREGtlnyh6dpiPNbEyYogXYHEiO01fuA9YCbjKkLbT6JihZ1Sr
-pulCuNRpSRobmTXx3dqNSEKAtwCPhkACpSjxLRhWhiz/yCTq2Gtnfj/AJ8LbN82d
-ub0uVqcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYi1pZHAtdGVzdC5vcnUuc2WG
-K2h0dHBzOi8vc2hpYi1pZHAtdGVzdC5vcnUuc2UvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFNCO/POVajXZInMq3ou0SdInZHIVMA0GCSqGSIb3DQEBBQUAA4IBAQCw
-vt65eqgtN1+QFyq5dmVXZ6LtggHupoVsYMtwS1hxDqsogsMBG8Q8HKZTSOIHxOJZ
-PwCTZuP93xWqa5r0D4w8W/4FxhpR3gnBzF9KSLSJ+zb99+f/6oxpTMMIcQjear+8
-Dp+2X1kVXtrJ8jhI0/ZDyAEYDv9OB5fLWjg7PworfuOm+bcYUXxdyTstkuMqaKuY
-LkDtPwQOSlQTw2opovGRVI7hHT89tkL3LY53RHSOz3T08J8PrWuggUO3zcpIfIGa
-tOfpY/N/6jk7YXOOupxcZTjF1ye+MntF2bXP1MWc90HUeaWfsrT7OWOplJIZ0vbV
-vs6Y0aXUmx4uTVjZQtbc
-
-                    </ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUOIOR9/vOXSKitXIAEB1uhk5hRFcwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
+OTU2WhcNMzYwOTAxMTI0OTU2WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVY4Vj+DCdA1Igb
+yz2UPXyniLHv61Q05LvG/1ECyuu79/Qr0B/f8IyKM+S+PiXXm7QlQAmfXWdLRd5e
+LuVUGNjXvBuDava+2yruoHY3Ay5DtmZQ0wpmK8NPRCO647G4dC+viY4lcWZtqIDR
+2mME4w+XBVZYVi3blrG99DqAIxEhN5JPJ1zqas/6JsaoMYvrS4cq5iwe5vubG6oP
+8wR2J8bfRSuLNHlBkhlctzzDsq6TG8gPajsP29nkIp7m6HKTKlsDyf+w/GdnxF+2
+pbOz3/jh/ET0+OB+eL+FO/f3EUF5WH/8pP3SkQRhWqrDeBxEXyFIB0kN6E4RKKBG
+Rhf/5KkCAwEAAaNvMG0wHQYDVR0OBBYEFImydoN/TfZT6En7jgsKNZTGro57MEwG
+A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
+LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAY
+874Wa9Z1g3WnpAOWinjjddVhnJ7B0GLMCasK7ctE74ax4kUcJKWxFjkIcF+6Pqwd
+KwVjBpDVsKGTEG5kb2cVZ1UKcoLo9PWMPuu0vHD4J4nWxciYWaZAgZgmEChRSllg
+afhj274z9wVMQMalKZr6aMw+nqxOxuDMVZFI3eJsDbpnZX7zl8RWwDhd6p+cSG+L
+nqC6xm+7gvxNFRxFh+Rb9I5h4JTSw65XLPfW+Tr3tVwJfWGrwDCLTx5QAC3yPDsZ
+LMTMMpgfHF1hgt28TdVQwk+pE0VqHUjouPIEUhFjaPpMWPiEpTjdyQFv4PDsE6lR
+d3hB7quCN72lcAz/8iZU
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ORUTEST</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Örebro Universitet (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
-  </Organization>
   <ContactPerson contactType="technical">
     <GivenName>Jonny</GivenName>
     <SurName>Ehrnberg</SurName>
     <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mikael</GivenName>
-    <SurName>Borjesson</SurName>
-    <EmailAddress>mikael.borjesson@oru.se</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>