From ebb0f73ae977bf1758142caebd07375725364ce2 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Thu, 21 Dec 2017 13:45:53 +0100
Subject: Resolved SWAMID-389

---
 swamid-2.0/idp.hb.se-idp-shibboleth.xml           |  6 +-
 swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml | 72 -----------------------
 swamid-sp-2.0.mxml                                |  1 -
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml

diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
index 55143038..bd08dcda 100644
--- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
@@ -220,9 +220,9 @@ hdayeb3tw8qRMHjEVgFSXDHRlA==
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>University of Borås</Company>
-    <SurName>Per-Olof Axelsson</SurName>
-    <EmailAddress>mailto:Per-Olof.Axelsson@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4697</TelephoneNumber>
+    <SurName>Campus and IT services</SurName>
+    <EmailAddress>mailto:campusservice@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>University of Borås</Company>
diff --git a/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml b/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml
deleted file mode 100644
index 22d7d367..00000000
--- a/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladokportalen.hb.se/Shibboleth.sso">
-  <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#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/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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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://ladokportalen.hb.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">ladokportalen.hb.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ladokportalen.hb.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Du försöker logga in på ladokportalen.hb.se</mdui:Description>
-        <mdui:Description xml:lang="en">You have asked to log in to ladokportalen.hb.se</mdui:Description>
-        <mdui:Logo height="99" width="350" xml:lang="sv">https://idp.hb.se/idp/images/hblogo.png</mdui:Logo>
-        <mdui:Logo height="99" width="350" xml:lang="en">https://idp.hb.se/idp/images/hblogo_en.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>uportalhh.ldc.lu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uportalhh.ldc.lu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAJQE9r/79RHVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV 
-BAMTE3Vwb3J0YWxoaC5sZGMubHUuc2UwHhcNMTMwNDA0MDgyMjM4WhcNMjMwNDAy 
-MDgyMjM4WjAeMRwwGgYDVQQDExN1cG9ydGFsaGgubGRjLmx1LnNlMIIBIjANBgkq 
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsOyRWECTEayEUPA38gZp/n7yAmxbQaRx 
-5UdNg0aL6/ubnreSzzgSC2dZ/RsKf6OqRtUmy8KgsxAPVaNmWJirWO/2S0sXSEUf 
-uZRAgtetTHJVcOjfN0XPoT0WB/z7BfL5nDQa/xT8EccUtNQBTyFvmBdy2o3qGtEh 
-pzSscFnHy1l0f/jwfzz6kEDlKl9YZD0qqGknA8Q+qavFSVrkcxfJ6amP6ZorUfjb 
-5B9/AGshVo9gMoRNK+xMlZpn80/rogXml+9Sa0FWoTU5f2jP1nFPduysfNMmmox3 
-KlS8xAL2La4RDY9M3LmiylWNMzLAC9+ZMaUYd3i1xZpuoF01Vr1i7wIDAQABo0Ew 
-PzAeBgNVHREEFzAVghN1cG9ydGFsaGgubGRjLmx1LnNlMB0GA1UdDgQWBBRkuwCN 
-p94hyVSpnqt+eFDwyK3sCTANBgkqhkiG9w0BAQUFAAOCAQEAN4Hren7Em14CBvZM 
-JRQk0A83VHtAB8Q/xZV+WM/Y6gBW7Oi6o0bR83tNMjljJu7jwBUCpsjoIv9xrJ8b 
-HAsokXqQMq16nEzixcKTx+hF6SSLipssg+H5bA9ed73hBvd+TTXnqNM1N5lSRCRa 
-D0OVyKSxNiIzCrhGH47NZxWPx27GdcrrvMrh+L5il78WYEs1A3aVsH47lzKKQFTW 
-BFIaHLDydw+aa3tG0LQxBc5Buw6dkfy9HRyWYNbsgXfRXX35Vc27DgeXmX1lqUUr 
-p42UyLfzJ7+RpY4aRQN3hwbYkm3ngivIg30ukw1ImqwMKTdCM6/yb4ttLg8FzYQF 
-6e57eQ== 
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <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://ladokportalen.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladokportalen.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladokportalen.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladokportalen.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index c26935b7..ca11fd7e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -439,7 +439,6 @@
   <xi:include href="swamid-2.0/student.verifiering2.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/edumeta.sae.kau.se.xml"/>
   <xi:include href="swamid-2.0/play.ki.se.xml"/>
-- 
cgit v1.2.3