From f3af9b449002a150577facb926426ab0ef831f58 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Tue, 3 Apr 2018 13:58:57 +0200
Subject: Resolved SWAMID-249

---
 swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml | 49 +++++++++++--------------
 1 file changed, 22 insertions(+), 27 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
index 9e669d10..e920f358 100644
--- a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
+++ b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
@@ -5,7 +5,6 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
         <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
@@ -31,8 +30,6 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Språkbanken</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Språkbanken</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning till Språkbankens språkresurser för forskare och allmänheten.</mdui:Description>
-        <mdui:Description xml:lang="en">Login to Språkbanken's language resources available to researchers and to the public.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://spraakbanken.gu.se/eng/</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo>
@@ -47,28 +44,28 @@
         <ds:X509Data>
           <ds:X509SubjectName>CN=sp.spraakbanken.gu.se</ds:X509SubjectName>
           <ds:X509Certificate>MIIEBjCCAm6gAwIBAgIJANTqNGS+Meg9MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFXNwLnNwcmFha2Jhbmtlbi5ndS5zZTAeFw0xNzEwMDkwOTMzNDJaFw0yNzEw
-MDcwOTMzNDJaMCAxHjAcBgNVBAMTFXNwLnNwcmFha2Jhbmtlbi5ndS5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALDidsS0JETlmVQttP/ZWkfHOuz5
-dWSo2jUSLK61yRNN1Ti7ZYrv8O4shEvKzhDxXMUKoiGWvzvKArE6ELrjBvpWciJj
-f5clh4NkKVrRUqQiHONO4f3XVFOJ2WGGHHK7if1YHuCdKUYbkuUjJ1f+GPVEInT2
-0cS2TO/BEpR859sJFghx55CH6ovg5PjvGp+apfA1Nh40Snp3Ssf6lES/Z2lLJNeF
-bfidkt4gkwGjnusQUcirtY4MpN6oEusyhU81Ly6pJOydcBaZzFxVkrbf1PTmfYcX
-8j7muuMMFKYMf+vYtL9rkx+kRtA8T0nESJCrovWVRoUJujGlq3yUFI6d8hiPYr2x
-xUOhia5EeLQOKevinvwvcnl51txwMtoc3WlVWHl5qv21JWupw4l5R98E+GEui2av
-+lpEnxluIM0fqnU/QO0j1QkmRP5o73kloms39CJMALWgLwUZXEe5M4EDnjF+4Oa4
-LocWuj/S1HO8SYEjUky0Rc3x1YHjz1qlNoBHrwIDAQABo0MwQTAgBgNVHREEGTAX
-ghVzcC5zcHJhYWtiYW5rZW4uZ3Uuc2UwHQYDVR0OBBYEFK5gYOUKyVkjcyJfveEq
-7qMCNF0dMA0GCSqGSIb3DQEBCwUAA4IBgQBz6Tr80qXJK3QztV4NQtns+eysSkR5
-MZYLA/8Au3khfvLKm851pbcNm8kIydWcHy3L/y+k4dBTurmYPNmqIJcn4V6+E8oW
-9RKcDbxxan8Z+epZinedR86Cl//BcGYCvd1VLnnLwC/otMaVvBJUTGKHW8AXIsoU
-YdaaogtWv+aMarnmggvq1op2mkLodvUvJqNU+5W3mtLRlNweQWAn0WSfSlnQb98H
-HINifOI9yhkw+kgayV/Vs9yhvRetSJFdxJy/RsIzsiBCB5gi/5jbCEyZKjthp1l2
-jJ/LCxMnNdmERg9Knn+fvYwDqAbvt5lvI0YjKHwyU/TVx4uAx/Yn0A62ZlXs1SxS
-quocDzbyT+8G/2hgINlcXMeffSNIxF0Bnqr7t0twwmz3jEXljt/5Xmawk63+sKnk
-XY2YJNAZj6iK43EuFEAVfDchxTI02c8/1RpjTipSSLbV7jzrUoz8wuY7zlLSrODG
-B1l+7GujpIQqv3B1RJA3m+G632LPFkBZgFM=
-</ds:X509Certificate>
+          BAMTFXNwLnNwcmFha2Jhbmtlbi5ndS5zZTAeFw0xNzEwMDkwOTMzNDJaFw0yNzEw
+          MDcwOTMzNDJaMCAxHjAcBgNVBAMTFXNwLnNwcmFha2Jhbmtlbi5ndS5zZTCCAaIw
+          DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALDidsS0JETlmVQttP/ZWkfHOuz5
+          dWSo2jUSLK61yRNN1Ti7ZYrv8O4shEvKzhDxXMUKoiGWvzvKArE6ELrjBvpWciJj
+          f5clh4NkKVrRUqQiHONO4f3XVFOJ2WGGHHK7if1YHuCdKUYbkuUjJ1f+GPVEInT2
+          0cS2TO/BEpR859sJFghx55CH6ovg5PjvGp+apfA1Nh40Snp3Ssf6lES/Z2lLJNeF
+          bfidkt4gkwGjnusQUcirtY4MpN6oEusyhU81Ly6pJOydcBaZzFxVkrbf1PTmfYcX
+          8j7muuMMFKYMf+vYtL9rkx+kRtA8T0nESJCrovWVRoUJujGlq3yUFI6d8hiPYr2x
+          xUOhia5EeLQOKevinvwvcnl51txwMtoc3WlVWHl5qv21JWupw4l5R98E+GEui2av
+          +lpEnxluIM0fqnU/QO0j1QkmRP5o73kloms39CJMALWgLwUZXEe5M4EDnjF+4Oa4
+          LocWuj/S1HO8SYEjUky0Rc3x1YHjz1qlNoBHrwIDAQABo0MwQTAgBgNVHREEGTAX
+          ghVzcC5zcHJhYWtiYW5rZW4uZ3Uuc2UwHQYDVR0OBBYEFK5gYOUKyVkjcyJfveEq
+          7qMCNF0dMA0GCSqGSIb3DQEBCwUAA4IBgQBz6Tr80qXJK3QztV4NQtns+eysSkR5
+          MZYLA/8Au3khfvLKm851pbcNm8kIydWcHy3L/y+k4dBTurmYPNmqIJcn4V6+E8oW
+          9RKcDbxxan8Z+epZinedR86Cl//BcGYCvd1VLnnLwC/otMaVvBJUTGKHW8AXIsoU
+          YdaaogtWv+aMarnmggvq1op2mkLodvUvJqNU+5W3mtLRlNweQWAn0WSfSlnQb98H
+          HINifOI9yhkw+kgayV/Vs9yhvRetSJFdxJy/RsIzsiBCB5gi/5jbCEyZKjthp1l2
+          jJ/LCxMnNdmERg9Knn+fvYwDqAbvt5lvI0YjKHwyU/TVx4uAx/Yn0A62ZlXs1SxS
+          quocDzbyT+8G/2hgINlcXMeffSNIxF0Bnqr7t0twwmz3jEXljt/5Xmawk63+sKnk
+          XY2YJNAZj6iK43EuFEAVfDchxTI02c8/1RpjTipSSLbV7jzrUoz8wuY7zlLSrODG
+          B1l+7GujpIQqv3B1RJA3m+G632LPFkBZgFM=
+          </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -95,8 +92,6 @@ B1l+7GujpIQqv3B1RJA3m+G632LPFkBZgFM=
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Språkbanken</md:ServiceName>
       <md:ServiceName xml:lang="sv">Språkbanken</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Språkbanken's language resources available to researchers and to the public.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Språkbankens språkresurser för forskare och allmänheten.</md:ServiceDescription>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-- 
cgit v1.2.3