Resolves SWAMID-2547 and SWAMID-2548

1 files changed, 11 insertions, 46 deletions

diff --git a/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml b/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
index 99c7fb25..877581f5 100644
--- a/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
@@ -6,8 +6,7 @@
     </mdrpi:RegistrationInfo>
     <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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -51,50 +50,6 @@
       <ds:KeyInfo>
         <ds:KeyName>www.wisum.its.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mats.larsson@adm.umu.se,CN=www.wisum.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEsDCCA5igAwIBAgIJAPSljFRXQ/2WMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
-VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQww
-CgYDVQQKEwNJVFMxDDAKBgNVBAsTA0lUUzEdMBsGA1UEAxMUd3d3Lndpc3VtLml0
-cy51bXUuc2UxJjAkBgkqhkiG9w0BCQEWF21hdHMubGFyc3NvbkBhZG0udW11LnNl
-MB4XDTExMDMyOTA0NTYwN1oXDTE0MDIwOTA0NTYwN1owgZYxCzAJBgNVBAYTAlNF
-MRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcTBFVtZWExDDAKBgNVBAoT
-A0lUUzEMMAoGA1UECxMDSVRTMR0wGwYDVQQDExR3d3cud2lzdW0uaXRzLnVtdS5z
-ZTEmMCQGCSqGSIb3DQEJARYXbWF0cy5sYXJzc29uQGFkbS51bXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMoMQ5OKrObHhxztzsddelykKBWYrH
-IrQOTUROELgi8UvMhupoePJsxLEGtursJ34cUCJQbb+5z0llFpUHJVshCKnU1YYd
-V+3qIZJLTVStq7R2XkTD7+0OqP0+KqRtqMzaPUlb5QCZlhkGAvuH1s+5/T9ASzvw
-5bTX8aJ9Vcb7cceCxaY7meqCVP/6dd1uQErGgRK8o/+8M2+IwkPv9IzfQKfPchxq
-nKKU1q70ES1C60T0PgZiv4U0PFQcUKihXZPKNmijyHCk4uM092HbuQi9/xiLDFrq
-cVjz2rUd0hmzDN4KGrIAmBhgI3qGwJ/dGnXDI5E/Nm5IGQy76GREiZdVAgMBAAGj
-gf4wgfswHQYDVR0OBBYEFArY6dz4n9LgrjqUv/Kj7qQeCGlWMIHLBgNVHSMEgcMw
-gcCAFArY6dz4n9LgrjqUv/Kj7qQeCGlWoYGcpIGZMIGWMQswCQYDVQQGEwJTRTEV
-MBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQwwCgYDVQQKEwNJ
-VFMxDDAKBgNVBAsTA0lUUzEdMBsGA1UEAxMUd3d3Lndpc3VtLml0cy51bXUuc2Ux
-JjAkBgkqhkiG9w0BCQEWF21hdHMubGFyc3NvbkBhZG0udW11LnNlggkA9KWMVFdD
-/ZYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAo7v8NM28YrhtT0Nu
-KV/DloFrVfhytyLNvqqununPPcbyLECvGDnT3OyqhbBdleXonFqa9wzacDUmFcms
-FRh6wVGgDy/w1sxmswdqZtXl7tKTjYmPAAoHScTkgSUAoQTOM+wJfhp9QhcbiYJT
-OcDpjfKHDLFsBPpZe+UjlqC/cNWZzLC4/hd1DnVldzZGeaVZxYv2IXFsXk1Kn5YL
-9Ly23JSd+CZxMhwnDbq07Lxr427ynvNezKoQj1befUeWNqODzIgudrCJ9ePHjTI9
-+y00LlpUhPJThokksq20YglJ6cnbKm206AQIZotZTkWDfZqrBXMkpd/T83v/RFrb
-9XlNvw==
-</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:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>www.wisum.its.umu.se</ds:KeyName>
-        <ds:X509Data>
           <ds:X509SubjectName>emailAddress=mats.larsson@umu.se,CN=www.wisum.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
           <ds:X509Certificate>MIID/DCCAuSgAwIBAgIJAMyGi7RgPxwGMA0GCSqGSIb3DQEBCwUAMIGSMQswCQYD
 VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
@@ -146,4 +101,14 @@ v07igvz+sMQGaroHoRamKg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tommy</md:GivenName>
+    <md:SurName>Larsson</md:SurName>
+    <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mats</md:GivenName>
+    <md:SurName>Larsson</md:SurName>
+    <md:EmailAddress>mailto:mats.larsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>