Resolves SWAMIDOPS-8462

2 files changed, 25 insertions, 21 deletions

diff --git a/swamid-2.0/acount-utv.hh.se-Shibboleth.xml b/swamid-2.0/account-utv.hh.se-shibboleth.xml
index 07d35fdc..134cd644 100644
--- a/swamid-2.0/acount-utv.hh.se-Shibboleth.xml
+++ b/swamid-2.0/account-utv.hh.se-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://acount-utv.hh.se/Shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account-utv.hh.se/Shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -25,7 +25,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://account-utv.hh.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -45,22 +45,28 @@
         <ds:KeyName>account-utv.hh.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=account-utv.hh.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJANQBgWyxjcu1MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFjY291bnQtdXR2LmhoLnNlMB4XDTE1MDIwNDExNTQzM1oXDTI1MDIwMTEx
-NTQzM1owHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDAzLvnPNl20YzyKq1w0+ItQ2dUuaB403f1CCm1
-rxWP2mti32s8si+FxOI1r+KTgAbOETbSK5rnZIrjPWMWjOttvb7KD19xlcQoZb4t
-RPlJeUaI6uWMHVefkqdw6ic0vuc2BroTA8odXTQ23F+BM+O5n5KcaRWg0ohYC+E/
-uz+xbbrMwtI+LWRG9U3rGVkITvvHYfG1N1GhbwnUQXXl7G49IjDb7IfR38ao2fxO
-AMs8sCJhb75vpv62GD0bItlxuR6B467WKnRXYoOJH0w959nXTRll+gn9KO5x+tjB
-tr0KSzwsMYHxzmdz5vZ1PeFDoA6Hrf2Is+/HKZvb2aqn4YEhAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWFjY291bnQtdXR2LmhoLnNlMB0GA1UdDgQWBBSsGXubXOkJhZfJ
-5W7GnickMPVnxjANBgkqhkiG9w0BAQUFAAOCAQEAYIEOH99rtKHb8Wmu3dmdjqmF
-TLd8+le3aK18fopuqcrBJNfCaAYONr1kqvxdl+tytesLX+/b/hDYGdRmMwNEdms2
-lyLlZ8WaOstWONbgCZa0npf9+9ldj2mG3f1jcwapmFLpkNfiJEKLxnDIXLPh318b
-26zJHgE6CYNMKS1VqubMNMOiwwqYS/mfmnIAmKxzv7Q5xxvDLUvVehXBZa9BDBFK
-M0k/gTbCKW5u2pm5OBnt3jdxAmuPcgMk3nsTbSABUCvqwR9w8fqHSAaHFwivUDLb
-4l1Yvcq+V6EZhqviCcHxfsRdDmUm7iXfxdWn/G/9vX2VKuba5JQ2ieZoxYVI2Q==
+          <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>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -86,8 +92,6 @@ M0k/gTbCKW5u2pm5OBnt3jdxAmuPcgMk3nsTbSABUCvqwR9w8fqHSAaHFwivUDLb
     <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-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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account-utv.hh.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account-utv.hh.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Högskolan i Halmstad</md:OrganizationName>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 56ffb3fa..a13f0d50 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -308,7 +308,7 @@
   <xi:include href="swamid-2.0/student.mit.ladok.se-student-frontend-sp.xml"/>
   <xi:include href="swamid-2.0/play.umu.se.xml"/>
   <xi:include href="swamid-2.0/play.kth.se-external-kaltura.com.xml"/>
-  <xi:include href="swamid-2.0/acount-utv.hh.se-Shibboleth.xml"/>
+  <xi:include href="swamid-2.0/account-utv.hh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/www.ar.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/kib-shib.hosted.exlibrisgroup.com-shib.xml"/>