From 30812b5a9a8cb39cb6423f286f862bbba7f2964d Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 15 Jun 2016 16:48:37 +0200
Subject: Resolves SWAMIDOPS-8249

---
 swamid-2.0/zeus.slu.se-shibboleth.xml | 88 +++++++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                    |  1 +
 2 files changed, 89 insertions(+)
 create mode 100644 swamid-2.0/zeus.slu.se-shibboleth.xml

diff --git a/swamid-2.0/zeus.slu.se-shibboleth.xml b/swamid-2.0/zeus.slu.se-shibboleth.xml
new file mode 100644
index 00000000..9e812450
--- /dev/null
+++ b/swamid-2.0/zeus.slu.se-shibboleth.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeus.slu.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"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <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"/>
+    <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/eu-adequate-protection</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </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: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://zeus.slu.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://zeus.slu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">zeus.slu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">zeus.slu.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">SLU:s tjänst för distribution av geografiska data</mdui:Description>
+        <mdui:Description xml:lang="en">SLU service for distribution of geographical data</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zeus.slu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zeus.slu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJAI3bvxePjFa9MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3pldXMuc2x1LnNlMB4XDTE2MDYxNTExNDIyNVoXDTI2MDYxMzExNDIyNVow
+FjEUMBIGA1UEAxMLemV1cy5zbHUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDAeo3kGKvUEQm+1/hlP2M+BgD+eeXTt5EGNePvoWvN2rAO9lyUQWe+
+vJxqjZ5vQgA7mgcGYYdvJcJdWQqWYMkilrScdstpyrCDIH4WnLjOemxKEHtxiPjg
+l/9d63a1Z8F50YpiL+TQsli5lDUwmKMezGTsTJD9m19thIHcjXmCUQriw8hH0ahs
+hrpby7Z/PbvKfQYVMOgpDtuk490YoMBpsBbr8f9KhZlKbr40EKrhPF5kZpx7jsjz
+QXLSLuq/3AI66z9LOhPSPrMg4z4a8tX7nGaCnX8nt4U4+s3dbZUfq/Ot5xDn9UW0
+HsNNh3DDG8SyoRjroZymkC4C9wUcfSPfAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3pl
+dXMuc2x1LnNlMB0GA1UdDgQWBBRppbeh6jgv0qDNhMxfRZuc3l9AQzANBgkqhkiG
+9w0BAQUFAAOCAQEAfDYUePSFohgKWXg1YU8czgnzpgtbu3lCBctB2XsYwUFozzfr
+Of9XRr28oDnUAre6TfwalT5Oo7i+yudn/vsJQ+OOQg7MbxAE7nxPrZeRAEdujNsB
+VXDUM1EsCBYOBKAoxECfjZteZNjjxeLomqZ3RHv08SHb7UqeYzvtUoW6oSf65xBJ
+AQx+pdK1HvqZai0OhkBDWaxj1s5cp21p1La9VsFjBv93EvoMdvln5v3ahoHfvbba
+tnnvjbDjiMz+ReqQkJFa3IBBV0RhCjwxvcdep1TwJ7e2xAwRSFzziMrDReQP676C
+pip6tdI9bf7wXvV/3/jBjGaeThWUoaJsO+TdiA==
+</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://zeus.slu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeus.slu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zeus.slu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.slu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.slu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.slu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.slu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeus.slu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeus.slu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeus.slu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mats</md:GivenName>
+    <md:SurName>Högström</md:SurName>
+    <md:EmailAddress>mailto:mats.hogstrom@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2b6e07c6..7c9aa20e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -586,4 +586,5 @@
   <xi:include href="swamid-2.0/luvittest1.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vfu-dev.it.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/zeus.slu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3