SWAMID-1686: Updated account-utv.hh.se

1 files changed, 78 insertions, 40 deletions

diff --git a/swamid-2.0/account-utv.hh.se-shibboleth.xml b/swamid-2.0/account-utv.hh.se-shibboleth.xml
index bbcb342f..a14e617e 100644
--- a/swamid-2.0/account-utv.hh.se-shibboleth.xml
+++ b/swamid-2.0/account-utv.hh.se-shibboleth.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://account-utv.hh.se/Shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-20T14:10:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -20,8 +17,11 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-20T14:10:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
@@ -30,45 +30,86 @@
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://account-utv.hh.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Högskolan i Halmstad developer site for user account activation and password reset</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad utvecklingsmiljö för kontoaktivering och lösenordsåterställning</mdui:DisplayName>
         <mdui:Description xml:lang="en">This service is only used for testing</mdui:Description>
         <mdui:Description xml:lang="sv">Denna tänst används endast för test och utveckling</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-sv-350x116.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-en-350x116.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Högskolan i Halmstad developer site for user account activation and password reset</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad utvecklingsmiljö för kontoaktivering och lösenordsåterställning</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://account-utv.hh.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://account-utv.hh.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-en-350x116.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-sv-350x116.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>account-utv.hh.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=account-utv.hh.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUZxEzKJ3kDq/GvtQh1pmSBA5GAo0wDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwHhcNMjIxMDI3MTMzMjE3
+WhcNMzIxMDI0MTMzMjE3WjAcMRowGAYDVQQDExFhY2NvdW50LXV0di5oaC5zZTCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANOV6xBmYlBQ95kxBjYL4EQk
+4IYGr6948hKp9Oq9wygefSkUs/S2KAMVTlr1/cK9IWDN5zbsKSb9JwGg6ySaqs9J
+Ff0B1GVvrQDaNK5haWB3Ihz2jBF7rD+TW5jOK/lYwfbkTJXLb+NWrro9HEIByG7v
+5tz5hkGc7k0TPXp/1vG19lxTbexS45NLtD4NUTS2j3++HE9zM1YHHvTLX8TGUnDT
+gCjcWDQoewud037D0I9IkdYtGcgmOU9dNH1jxCmcJNFeg/4poc1UxqVJUZUS92qR
++BcdPoBrCYHqoXLidEYLYLxZALIMpqX34y/msLv7kDvWZRmMpCupM4PvK3uAV0VR
+f5APMAjbUsH95izClmwbEvTkx1XQXG4YgF6kgdbOOO6UIfvF6Z3XAWyRRnsAd3tt
+3uTyNx1vm/Ex1g5lhbeH+cxxFkrCKMDLwa8ajlvWBM5cNWHKEOh75LfvzZVJAeNp
+4+eaF3AmO2qc8eefj9vFXsROolgmtbNnSQs7vGOYyyjNGtlcQslVgR9oEr/hyZIz
+hvQE+O9x+Qc/bzCLBK2E3GZaIinydVU97KP3PNE2Kvxa3CIhqdA6inBzOb4W6vGG
+uStQakuue9rtSDP9hgssFKFtCBgcS/9pDXB/GbXefZERHnnTtwf82PKEr0hBKWGW
+PCk19HWpy0g6m9BjB06nAgMBAAGjPzA9MBwGA1UdEQQVMBOCEWFjY291bnQtdXR2
+LmhoLnNlMB0GA1UdDgQWBBRBDdOyoQyT/+w7ApUhbFsxQeXHJDANBgkqhkiG9w0B
+AQsFAAOCAgEAHQAAtgoCGqPv2z15F+TB/4u7tvz65eFb06YN8RmckiWb77fHG0JT
+/FCr51Zr3EDVUU3DCe7KLvKRUG0WReC4ANYw4f/L0pJ25841Uwm41tOwB7ek8Qps
+X34rUsPdxmLjbXBHvNio9KobAqz/ENs80boFon73wuKa36rl3wrTGWrLYDG4+VOm
+2FH6bdsME30hDLsemOxBvslOZehGheRQwCFSBwK5rTD7/BEEDZtXWPn1TmFg2CAX
+/+nn+P4wd8t1uneK3AxpBu+11iZS6u40IMTHinco3KHQkYPFRC7C1GCofju2iLkt
+OjWpbWovR8PMifUwbjU2rLYDgCUfU94F70U3IvsSBQNzNbesvzv8Dy9e5vD4kkhg
+jZr4j0blZqP0OAuvLVGpTU0QRqxkd8wcmWijMuVl42TKP1td174M3UJ1bXjpBv9S
+qhfDdOqcdxVldx0U54sWk4reOQTMVFX0viBPvCe4Fl0XgMyHVCEEkId6p3B13BdN
+eXvM3fJjAPLBXN5N+wr2L/o/0gsTZLQNIXVLNXigZyQvTMKveC1TUyInanksWI2e
+ufL+FCkZsl14GWuv5SJB9QA1wuIuLrSEGOEUD0KZgUETvEWaJOmKHdQ9gt64KqsX
+32LlH8M6eDC+/v568zngqcX6YxTxE8kqtakFNVyKtZrh7XZEsQ5T8nw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>account-utv.hh.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=account-utv.hh.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID+jCCAmKgAwIBAgIJANeDUAW7mkq6MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEWFjY291bnQtdXR2LmhoLnNlMB4XDTE3MDEyMDEwMjczMloXDTI3MDExODEw
-MjczMlowHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDDNTNrQauTXZtp1RF0JsuzgRodAw977xgAErnM
-gSUUq/9wekajDi+wnYOt5xnyIrUg0S+Ehak1y6mLXeX4onw5W/KYc8PFpxLEaW2b
-HHGeGOaGPrF1iOcscXLjjCqS+rrTr32u+nTNtDGzS5xUee9vCulfb9QKJQWo3HIS
-aQBIEWEEgkbv1/Rl2RK4uAgBJGtTuEuyBNa1jgIfiHMy65i+b5LdCdazHmit7Rl6
-D6dlukIzEnjU7zmXc+AIpDKys/ApRttsNqkxFnv1DrlT5yTtM3OylJPVUxp9aswo
-9BEsTGr56+G/tzx2ckppPOmMuejZAYUtOyPky5EtegnHbM6cFBXSwW7gEUAOrDzF
-DmYfhIXYhluIYNIz8m+YyH1BQM5uspwsp5/STLO/EXPUR2YXsRJ9GfxzNQzRZS7y
-cfJonZokszL8dCzW4STTc/oXZRQh15xHaDxQvSz2fKPafzl11W40CGg8DstwUWTP
-CUyILzK66LEVkm1WN6xT24wBxmkCAwEAAaM/MD0wHAYDVR0RBBUwE4IRYWNjb3Vu
-dC11dHYuaGguc2UwHQYDVR0OBBYEFGsykFo6cqgQqcTizoc9F8nDQJEYMA0GCSqG
-SIb3DQEBCwUAA4IBgQBvN9hNHMRUEN05D2Lj73dHVMdPJ0W9pgVsNSyyKxfd6vLT
-XoYEytona/BfkilJxelX/fwu+PcJDDGZFXdy9DMYtiUtOzm8MHSHcFKbtHCTl9kD
-MjHXicgQOTYbWWjz7AcZsivER281IM3TlwrAj+sW8HB9Ro3K633GkFTnkworclc/
-1GR07I+UlaXKBaaYSBGHi7fcfSSunKzJF2YH3+WW2j+cRkpx8/TBLsoFgjXmdgrL
-pG3P3MD75ssjfCvbEFWYplVGUeaAFR2aW4DSvRGqkGQvO3CeSsZNV1aHUh+x3Yz0
-sZgJsQSoaSa4xk/vKojuR0FYYomLKehkgrQ7IG5pN+sBhZ08suLY5VZA5lFLsQTk
-wrE5E8PkirNAGewN2PENm+PgEOUuZ6nHCBZWPiBppFoDqmpN5RBgaVUtt3Y7bCoi
-SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
-4LCnJTXEDEPlvaLqHsE=
+          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUHLqGIcHWmsjVx4LKZubkaABabe0wDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwHhcNMjIxMDI3MTMzMjAx
+WhcNMzIxMDI0MTMzMjAxWjAcMRowGAYDVQQDExFhY2NvdW50LXV0di5oaC5zZTCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANOVF6A2E2t/fwTYtYDQsvx5
+FWnM0uxO34zTLw6g5oWiYX2vAh3BrhzWbgaDvqG947qWFr0YFntQ4Q6Y5g5ffLS+
+dheJ7UTyZoM0Ix5dKasp8+fDO3I73Gc6Y+AvoBRT7UkUuCosXmeIZSdgcalZiwFz
+bCmdi85xcePRJY67NhMuWkKC6kLWQoP5JOnUulfbZKai4VT9LZIzJ0zwuDqtKNlm
+Qj2wFWF8fKf9cw2AMQ5CUlhgcB1y7WcBa0t0/sSR10g6zMNp3AXcSHoBpaGariT4
+d+tH6TEmljKQ8CGpYwAnAmfy8UzbpiOFFhfoyZvxb0VpKXDEUz+PkTRjQkYrjZ+y
+BqeXw50cp+qyw1yPioL1P0C709m+VnDKTzfJ5sZgO7/BOBoNcTKC+LOErCFV0S5K
+VLJUs7XkuEtfA36zB0VNrHXIjJUgSt1zuD0/YdV2kTn6ZtKhfL7JVyEqIg7zNe8v
+X5EMGeomcAN8+Jr3Gqx79j/tvn8sgxKgpvBN7Ujry1R32kUSXDOuxOZq0bMvaa9z
+zwS131ubkyLcLzYMBTi77WsTNFVut2EOyvdjSJ+XDwHDR6SRpnvENFyFytm8sFIk
+TqnSQV9iS2reMpho+P0q9x4mpGfQcBb3nX8YYioFaepPLVba4HedjxrKD82vUeio
+jhUH9HKZvSDme5Hvn5mTAgMBAAGjPzA9MBwGA1UdEQQVMBOCEWFjY291bnQtdXR2
+LmhoLnNlMB0GA1UdDgQWBBQ0J4Z/i1TA9AAQFH1V48Sy8ZXCizANBgkqhkiG9w0B
+AQsFAAOCAgEATUTRs4z1qxbJRBlN25HzUqRXqlK+EqwpqcllBth6l3bAUVeL0gGi
+Mwthi57ROdHDIHRLVkp/gEh58MdsnZF9UC0ZhUlg+FgZvL6H5b283NKZlNPUFqmb
+jbfTu3dloRWb7IbGvjZ2d3k52tXDZuZNm1zxw+STUVVnckyVRBAY++jMLp2cwUQV
+JntMGIzzhepz2xKN4jqib89n7EFLTI1K19xbLqt8l2LegfSk0jGyxq5G9SmyUMQ1
+Q+oYaFAEnSE/LccRQaLKQX0RUAUY7MyWjSz9FYYMmk0Uv1W9bOyiPJsmiT0roVGo
+f+hFxe+pPV0On3iPAy2L7CvC4fdog7X3Ub2ywBTi1NHeIBn/Sr46RY7zCcGU1/GU
+Bgf+pYzJOuk8+8XNmYcaAbgZ7JWW0OwBM/ngfKq2jGDT0iKtMi5+nmkbfg+BxSUz
+qZNs5gPd5P9xYo7d3bLV8T4WZUTs7bIJyNtngm5zdLl7XiPG7aySB4Q6IgqCACxi
+mIjZa7CCKUcoMdMT2l5jbcTvAkj5mXZV5xdHI19Km8RN6MksuqK4xxcI/6U2SSE7
+KYbuezOxT/WF+lZh1ovkpUXpnFdYzWq08YI8In+sdQ0edoOhrJfPaXtBQBuK/sOH
+2ROYpYPv8z27QGDrjR4uZAltn+aiDzdiwv4T43ZkwafCYBh8ilQVNjE=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -87,11 +128,8 @@ SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account-utv.hh.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account-utv.hh.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AttributeConsumingService index="1">
@@ -101,11 +139,11 @@ SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Halmstad university</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Halmstad university</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hh.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Halmstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Halmstad</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.hh.se/english.html</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.hh.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">