Partially resolves SWAMIDOPS-110

1 files changed, 35 insertions, 8 deletions

diff --git a/swamid-2.0/idp.antagning.se-aws-idp.xml b/swamid-2.0/idp.antagning.se-aws-idp.xml
index ddd39581..174aa361 100644
--- a/swamid-2.0/idp.antagning.se-aws-idp.xml
+++ b/swamid-2.0/idp.antagning.se-aws-idp.xml
@@ -4,8 +4,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Antagning.se - ny</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universityadmissions.se - new</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">www.antagning.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">www.universityadmissions.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för sökande med konto i NyA-systemet.</mdui:Description>
         <mdui:Description xml:lang="en">The Identity Provider for students with account in the NyA-system.</mdui:Description>
         <mdui:Keywords xml:lang="sv">antagning.se universityadmissions.se</mdui:Keywords>
@@ -17,6 +17,24 @@
         <ds:X509Data>
           <ds:X509Certificate>
 MIICBDCCAW2gAwIBAgIJAPVea+I+ZF5nMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMTcwNDI2MDgwOTI0WhcNMTcwNTAxMDgwOTI0WjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNpBNU58qD9eIlsQ8DWnOz+/nEaK1Th/UlDh7qTRWibDmS3pxK5wJ/i9cg1HnnYJSPa1M+ZqtFD3tOqCJsU9USX2V9i62xLwD28gp/TW99aoRQkCt9Eya7AVRxlNSdYEryK3We9Be+w35gbn6nT/0U1bYT//PXU/r9AoNcAp7rKwIDAQABo1AwTjAdBgNVHQ4EFgQU7478/s7WtAeAxh2JHrpKAWBIhRYwHwYDVR0jBBgwFoAU7478/s7WtAeAxh2JHrpKAWBIhRYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQA6X1jgxAMFHc9/goAhbkSPExpvsI3zbKmObTsicdLFeyhNTaR0EywUwcNUoSkZXF4cYINy0FuS2A81gRn0KlP8p4iQ8PEZ/DTOEvQNVSxUlPXkxD/yYBVH/FdXH5UskzkdtyK/xFUxfXLNWAZyRB6S8yvpODJMskJL8cApRqrnGA==
+	  </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICBDCCAW2gAwIBAgIJANzswMCdTsm7MA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMTcwNjIxMDcxODA4WhcNMjIwNjIwMDcxODA4WjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXgJr5h/UrxcLP9pzUAyxqvavHaY3q3ohZAOrfjSFWF4ysrECTAB5QgCd4IwgPnNftw30FkdjT/TODwKNe27d77DVjbwUUJ4Q8wv+qe0DndgmAMN90b7h4H5Sfjo0mY2EKbaHSZaN2jeaUV2y7hfzBfWXlf8L3XRSkD/CHvEodSQIDAQABo1AwTjAdBgNVHQ4EFgQUHyX8kwdM66msflKEJqXR3k3B95EwHwYDVR0jBBgwFoAUHyX8kwdM66msflKEJqXR3k3B95EwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQDMgoK/ycOkWxlXusdWQ1JHcJpUb6rRcflE5x8wS53DlLfdaEz24PJDvvGFEeskkQoIzjqVBlAmlBzVWtzyrnZhLOH7fE12riA+ax9w9FB37evsEd3mfSUHrvwH2J9LtFjLBy43Zw2ja+uiA0yZpapTFlKuTgFEqIcNWz3QVwKukg==
+	  </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICBDCCAW2gAwIBAgIJAPVea+I+ZF5nMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMTcwNDI2MDgwOTI0WhcNMTcwNTAxMDgwOTI0WjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNpBNU58qD9eIlsQ8DWnOz+/nEaK1Th/UlDh7qTRWibDmS3pxK5wJ/i9cg1HnnYJSPa1M+ZqtFD3tOqCJsU9USX2V9i62xLwD28gp/TW99aoRQkCt9Eya7AVRxlNSdYEryK3We9Be+w35gbn6nT/0U1bYT//PXU/r9AoNcAp7rKwIDAQABo1AwTjAdBgNVHQ4EFgQU7478/s7WtAeAxh2JHrpKAWBIhRYwHwYDVR0jBBgwFoAU7478/s7WtAeAxh2JHrpKAWBIhRYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQA6X1jgxAMFHc9/goAhbkSPExpvsI3zbKmObTsicdLFeyhNTaR0EywUwcNUoSkZXF4cYINy0FuS2A81gRn0KlP8p4iQ8PEZ/DTOEvQNVSxUlPXkxD/yYBVH/FdXH5UskzkdtyK/xFUxfXLNWAZyRB6S8yvpODJMskJL8cApRqrnGA==
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -38,7 +56,16 @@ MIICBDCCAW2gAwIBAgIJAPVea+I+ZF5nMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRh
         <ds:X509Data>
           <ds:X509Certificate>
 MIICBDCCAW2gAwIBAgIJAPVea+I+ZF5nMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMTcwNDI2MDgwOTI0WhcNMTcwNTAxMDgwOTI0WjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNpBNU58qD9eIlsQ8DWnOz+/nEaK1Th/UlDh7qTRWibDmS3pxK5wJ/i9cg1HnnYJSPa1M+ZqtFD3tOqCJsU9USX2V9i62xLwD28gp/TW99aoRQkCt9Eya7AVRxlNSdYEryK3We9Be+w35gbn6nT/0U1bYT//PXU/r9AoNcAp7rKwIDAQABo1AwTjAdBgNVHQ4EFgQU7478/s7WtAeAxh2JHrpKAWBIhRYwHwYDVR0jBBgwFoAU7478/s7WtAeAxh2JHrpKAWBIhRYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQA6X1jgxAMFHc9/goAhbkSPExpvsI3zbKmObTsicdLFeyhNTaR0EywUwcNUoSkZXF4cYINy0FuS2A81gRn0KlP8p4iQ8PEZ/DTOEvQNVSxUlPXkxD/yYBVH/FdXH5UskzkdtyK/xFUxfXLNWAZyRB6S8yvpODJMskJL8cApRqrnGA==
-          </ds:X509Certificate>
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICBDCCAW2gAwIBAgIJANzswMCdTsm7MA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMTcwNjIxMDcxODA4WhcNMjIwNjIwMDcxODA4WjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXgJr5h/UrxcLP9pzUAyxqvavHaY3q3ohZAOrfjSFWF4ysrECTAB5QgCd4IwgPnNftw30FkdjT/TODwKNe27d77DVjbwUUJ4Q8wv+qe0DndgmAMN90b7h4H5Sfjo0mY2EKbaHSZaN2jeaUV2y7hfzBfWXlf8L3XRSkD/CHvEodSQIDAQABo1AwTjAdBgNVHQ4EFgQUHyX8kwdM66msflKEJqXR3k3B95EwHwYDVR0jBBgwFoAUHyX8kwdM66msflKEJqXR3k3B95EwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQDMgoK/ycOkWxlXusdWQ1JHcJpUb6rRcflE5x8wS53DlLfdaEz24PJDvvGFEeskkQoIzjqVBlAmlBzVWtzyrnZhLOH7fE12riA+ax9w9FB37evsEd3mfSUHrvwH2J9LtFjLBy43Zw2ja+uiA0yZpapTFlKuTgFEqIcNWz3QVwKukg==
+                    </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -49,26 +76,26 @@ MIICBDCCAW2gAwIBAgIJAPVea+I+ZF5nMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRh
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">UHR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Antagning.se - ny</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Universityadmissions.se - new</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">www.antagning.se</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">www.universityadmissions.se</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <Company>Universityadmissions.se</Company>
     <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Universityadmissions.se</Company>
     <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Universityadmissions.se</Company>
     <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>