1 files changed, 52 insertions, 44 deletions
diff --git a/swamid-2.0/sig.idsec.se-shibboleth.xml b/swamid-2.0/sig.idsec.se-shibboleth.xml
index 01fe47d6..77552ff7 100644
--- a/swamid-2.0/sig.idsec.se-shibboleth.xml
+++ b/swamid-2.0/sig.idsec.se-shibboleth.xml
@@ -31,56 +31,53 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Upload and Sign - TEST</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Ladda upp och skriv under - TEST</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SUNET signature test application</mdui:Description>
-        <mdui:Description xml:lang="sv">SUNET test applikation för signering</mdui:Description>
-        <mdui:Logo xml:lang="en" height="500" width="500">https://www.sunet.se/wp-content/themes/sunet/images/sunet-print.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="500" width="500">https://www.sunet.se/wp-content/themes/sunet/images/sunet-print.png</mdui:Logo>
+        <mdui:Description xml:lang="en">eduSign simple signature test application</mdui:Description>
+        <mdui:Description xml:lang="sv">eduSign enkel test applikation för signering</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idsec.se/home/edusign/utv-beskrivning-en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://idsec.se/home/edusign/utv-beskrivning.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idsec.se/home/edusign/dev-privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://idsec.se/home/edusign/dev-privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="en" height="50" width="165">https://sig.idsec.se/sigdemo-dev/img/eduSign_logo.svg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="165">https://sig.idsec.se/sigdemo-dev/img/eduSign_logo.svg</mdui:Logo>
       </mdui:UIInfo>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sig.idsec.se/Shibboleth.sso/DS/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sig.idsec.se/Shibboleth.sso/DS/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>Shibboleth SP</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=Shibboleth SP,OU=Test
-environment,O=IDsec Solutions AB,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEUjCCArqgAwIBAgIEXYI88jANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJT
+          <ds:X509Certificate>MIIFZjCCA06gAwIBAgIEY7XW0DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJT
 RTEbMBkGA1UECgwSSURzZWMgU29sdXRpb25zIEFCMRkwFwYDVQQLDBBUZXN0IGVu
-dmlyb25tZW50MRYwFAYDVQQDDA1TaGliYm9sZXRoIFNQMB4XDTE5MDkxODE0MTkz
-MFoXDTIwMDkxNzE0MTkzMFowXTELMAkGA1UEBhMCU0UxGzAZBgNVBAoMEklEc2Vj
-IFNvbHV0aW9ucyBBQjEZMBcGA1UECwwQVGVzdCBlbnZpcm9ubWVudDEWMBQGA1UE
-AwwNU2hpYmJvbGV0aCBTUDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGB
-AMwmomlhzhDE9ZaLIkVrNMVbIrZ83Yzb7gcl/X+UtjnPoC1/5pekiCTVC1lKYCpO
-8Qm4eqD0MMcV47ZZiaWDuWFWE1rG856Nii7sPnOjq5k/AzyFumZWjgEYXGTMoeeD
-R/VswFr35oev8SydISw772Pm28N5RcKfxISX0Q8w7uhy8dWKiJVV0zIWVTcwmqU1
-wBVdQ8WsAnje7Z8nr8yxQ1iQIZSn3y4k5hLMGHhuyY+EnY5HRMWD54ACBQMhmWFq
-joHd9E7bPij0k9FtsacxveQdclLa07mRUTLMFnG4mIqiZaunyvua6MSa/gktlhza
-vtxK5l92JaPYLcTCeBYEyNhmAfZkY1+VbGQkiXxAkp76SNSvnC6oigOwXuWUGjcR
-cageS2zWBunkSFkb0JZowcRlgzHljXviEClSQUqCRbJSjZN7Q63TQ0tymr1ZpIBn
-r3GMBHgo8Pmv1gPYwrEHYoIYM93S/O54Wl6YxAMPqkrDVE3kuBjsQ4XjQIFzgu6D
-owIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDANBgkqhkiG9w0BAQsF
-AAOCAYEAgpaK5QQlJP3IFtZWPOJwfpJ/xI9fZE56MI+yWvT3SDCo1rE+EbLmVyMX
-0q+Vmqo3vprduvsZ5vdTeC6RIs9+7uVWWrjRq9syl1Dp5bkbayRJgBPAK5gZMh3g
-N/vH/QKqE2UF6mYqTu+4Xtl2UHvs2pd47NA1rBjTE98vGEDWwoLRPqDxcLkaBa3h
-qew6jZhqH8oTCd0YmTYDcRS+SZeHe33qHD6w4mDkVlHSJiw1bofK3bnWw7KtHzJx
-lGVzSy9VZ6+yKma74ZJaSMXWN8yLCAq5X7OXQh73pk7JV2VpubSawaJkNhGm97VG
-StN7DI9gbAwADRgF9AYVzXCjZ/Q9Oj8saoIL7mkfYmcJe065ylCDANYRnFknW5Tc
-AUiQuzF9YdXJlivci6XaH8+fqL/HOLcLflk4Tv4rrxaldr4DHn0xYkxgMSCFi5x9
-4z9CJ9P4U3W2Lv3qiY7olVbeTdT02SGSV+h9/WtsYJJC9FGBmUNSc8YVQBdzyhym
-F7vl9NdL
+dmlyb25tZW50MSAwHgYDVQQDDBdVcGxvYWQgYW5kIHNpZ24gdGVzdCBTUDAeFw0y
+MzAxMDQxOTQzMTJaFw0zMzAxMDQxOTQzMTJaMGcxCzAJBgNVBAYTAlNFMRswGQYD
+VQQKDBJJRHNlYyBTb2x1dGlvbnMgQUIxGTAXBgNVBAsMEFRlc3QgZW52aXJvbm1l
+bnQxIDAeBgNVBAMMF1VwbG9hZCBhbmQgc2lnbiB0ZXN0IFNQMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAjRt+EpbLVuwz9o7tbd9mIM14m0NwUmUe8tzu
+qCcqHOpbEOXdX8Hq7avG+WpVR0VzEAXegwBVSoSW2TuRDxdiXV12ZaMR4bgXsa4J
+j2S9ovp4MZLshMG+5nTIhX+luHyPfQ6uaAR7qEmQj4mPkIVmLNKFlnmlQMapt0NT
+VevsohmcYWzK50wM4T1W+7f3u/oncJHrgVM08tXd+ckIJ1WJ8LYXW1eY13eGXtn9
+tFQm2MZKQnMs4XlVHcLk5W/+lP4cZLRKZq1zAodND0ov7Zjtf3LXN0SEOIYyp3Xu
+mQhNmjIqJaoX6VDVefpkP0kQ6Q1idDKzxYZm3RhN8sgvFP4NUnpJMZ3L2SsTmgNC
+zMKDC5l/gnl296Ctgulg8V5sJHsVW1LHy3nTKST4PE2PnBxJMKugaDXDPvDrlYoA
+1/gSjrO+9XkKe/rVkzjOwLAqUv2ZyesbWFDFw/QeQ9t6XLwTrznvo2x65t6/Alto
+twtoc8CcFAGiUQ/9b/W9M0XrOH1J+A/UYUYA5kUjE3qCV1c86mx9ZxJc5amDCJ3l
+Ls9cl7gH2QCxWvL4IIHxNzGxNofOYAg9Xako4q0o4+kftO7auylR+Eeyk0+Yqlo4
+vaKnpJSHfh11wxsbr/kEbUnf/QHO42Fl3e/ojf+k9eYnlGgaGO3nnPIZ9Ha9QbBV
+gk3egvkCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwDQYJKoZIhvcN
+AQELBQADggIBAFqPhSHNBrj8NFMCNdcz+cDzBKaH5NJfPzATiw1ITbqpB+lcISOu
+PsCUuoIKOW2IoYClPZ637OH5eLFZA8gUW7Q45CM/GCGf7BEwl3232m5owjZiUFfo
+gAHXekx3DpanDA+6E9o5A/9u5BMWAKOxaKbp0Udz4rmoiorho6Z7lFNsmEvFQrOE
+yOWforMJU1AthPQ9/9QEX8KWtM0twXVr92nxoUlwz3e+IQONDcaaUeEHB/Rr/ZkY
+ZyHiAyeujxE0qspxc6mQqwl/GuiotIL0ZDKRrBheuu89utEhBTae1GP2SVOtJVBv
+GPw8gJ0uV9OI1vUShv3azc3FIVvW7VcnPzx1bUT59t4kUtxBuG8tgm1H+NPV+GNf
+u6D6/9OB6VJOQ1kh+nphJsUOPbxcYMgaarFKE20WhQpqY2bC4r23mOpkAlXznfhL
+g4jOSp+Nbr7Cp18wAG/jebAc+Y9N3yXJrRcUdOGWBqUMBtHFDuqktgqo8ggl+gZh
+r9W/hsjiRzlFSpHyvJzO/ESP6Xcl0x00RyMd/YUa985dewwcX8foQUkwli1t7qY+
+1ipdx101D7XJ6hMXuCkkGj6TPj0kuqAvmS576qur/1IiBTydFWOeQ+/VhrmSNaS/
+Ups/jHo17mVCZzcM0x5imtqhWLwjaXR+W/DEdCM9mmbp3HEZoCRhB66c
 </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://sig.idsec.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sig.idsec.se/Shibboleth.sso/SLO/SOAP"/>
@@ -92,11 +89,12 @@ F7vl9NdL
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sig.idsec.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">IDsec Solutions</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">IDsec Solutions</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IDsec</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">IDsec</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://idsec.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://idsec.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:Company>IDsec</md:Company>
@@ -108,4 +106,14 @@ F7vl9NdL
     <md:GivenName>Technical support</md:GivenName>
     <md:EmailAddress>mailto:sts@aaa-sec.com</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>IDsec</md:Company>
+    <md:GivenName>Administration</md:GivenName>
+    <md:EmailAddress>mailto:sts@aaa-sec.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>IDsec</md:Company>
+    <md:GivenName>Security</md:GivenName>
+    <md:EmailAddress>mailto:sts@aaa-sec.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>