Merge branch 'master' of git.swamid.se:swamid-metadata

1 files changed, 43 insertions, 1 deletions

diff --git a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml b/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
index 7f4e5036..f970c853 100644
--- a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
+++ b/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
@@ -27,7 +27,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <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:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Halon Kontrollpanel</mdui:DisplayName>
@@ -38,6 +38,46 @@
       <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://halon-eu.sunet.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halon-eu.sunet.se/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>halon-eu.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=halon-eu.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEBTCCAm2gAwIBAgIULkKPd/CXKCPsRQBFu/4Lv42cRKUwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAxMRaGFsb24tZXUuc3VuZXQuc2UwHhcNMTkwOTI2MTEyNDI3
+WhcNMjkwOTIzMTEyNDI3WjAcMRowGAYDVQQDExFoYWxvbi1ldS5zdW5ldC5zZTCC
+AaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAL7ihxti94w+iQsUryb1kldP
+5j69KNPAMa6+YcVmrpezHFbyeN+rMP0r0359sfnVJ2dr3o1HxpqHhOBnpoJaNH9P
+TUubh14K6slMPxbQ2/TigAhnn8lgOUsqYi0Ke/Um1okLJHZprZRKhYh6wEFpwxrR
+vTpmdDK1ISbpRGgYvRE6zl8tISymi9wpbcuPzTy3aY5kkJwwasYQOEwvUfAfhi9w
+tvKpRgXXQddsrNI8IUYpW9WwpTVWFaeMhF2y9imY8+gQuzsbMSu/9R1v0sQiaQrK
+jd6gXM9g3SriLkpUDO7O+ysWCFC4Z1SW3+PzIVMmWKK7sKRiEZ4gDD5REzACJnce
+9dqf0nYsE6BDzjDdv5vGJ5Se54n3NztCzIVog11MkJpsFpNXBo9k5KUpUY9bqvZ9
+PY6j3pQJFxVouLCJRWABOtFM0FXeuFn9h+dmAFDG+d55N3JCYgjcDpUh3lOxi6Gd
+bbx40dsrdhRiw/TWRVyo4VQgWaMD/VQlp0VRw6LoXQIDAQABoz8wPTAcBgNVHREE
+FTATghFoYWxvbi1ldS5zdW5ldC5zZTAdBgNVHQ4EFgQUgxzkqLU18BtEch/Rnx1n
+GWG9V4QwDQYJKoZIhvcNAQELBQADggGBAEk0s9YU/T8g/x7I6GcsyL6Rc3wTGJ1L
++E25DBOElDKTr8KVhZL93v8o2sFbwgy5x910xPGoHRmxuFxmtllr1nP4ceQBol+O
+TlPCIeqIkVbCawb3jmweiZOvuUztwFSJRXH/9f5qCM5pfer6l+GTSNZynZHXnX0C
+LRWKnSMWdh8nkdDuIv9dz3tiwfUmTAyULYfCOFE2jcJVposYNPr531wocHwGeWd+
+f0TqdCa5wlxhE+dnR243VR3fXLIDMwtDFC9T+wG6zFKNqMaPvaw0NheEKMr/P3xg
+9GUItvR+Q7pWCpR2+ES9CkhnWTxPA06fd4pPdJc8b3l5Gv1kTEEj6u5XhZ3cP7lv
+DHWP8cgwx2vtq4MKzdUdn0x/Hb9fT/MWszjyqJyuvxK0hmLxegcWXxLSypTarV7l
+xSxsRARlPrKztIbnHB4erd0hhaHcs/Mu1MkJq5TYJvTkCpky+QVf7dZcFhEMnEoi
+uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==
+</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://halon-eu.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halon-eu.sunet.se/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halon-eu.sunet.se/Shibboleth.sso/SLO/Redirect"/>
@@ -46,6 +86,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>