From d0611351bec79863fb005e4b47aa29894bba7b76 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Thu, 12 Jan 2023 16:07:22 +0100
Subject: SWAMID-2475, Updated secure.ouriginal.com and
 secure.urkund.com/shibboleth

---
 swamid-edugain/secure.ouriginal.com.xml         | 19 +++----
 swamid-edugain/secure.urkund.com-shibboleth.xml | 72 +------------------------
 2 files changed, 8 insertions(+), 83 deletions(-)

diff --git a/swamid-edugain/secure.ouriginal.com.xml b/swamid-edugain/secure.ouriginal.com.xml
index 1676b5fe..6e5c43b2 100644
--- a/swamid-edugain/secure.ouriginal.com.xml
+++ b/swamid-edugain/secure.ouriginal.com.xml
@@ -21,6 +21,7 @@
         <mdui:InformationURL xml:lang="sv">https://www.ouriginal.com/sv/var-berattelse-2/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.ouriginal.com/our-company/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.ouriginal.com/privacy-and-personal-data-protection-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ouriginal.com/privacy-and-personal-data-protection-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -28,8 +29,7 @@
         <ds:KeyName>secure.ouriginal.com</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=secure.ouriginal.com</ds:X509SubjectName>
-          <ds:X509Certificate>
-            MIIEGTCCAoGgAwIBAgIJAPuiM7HVLa95MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+          <ds:X509Certificate>MIIEGTCCAoGgAwIBAgIJAPuiM7HVLa95MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
             BAMTFHNlY3VyZS5vdXJpZ2luYWwuY29tMB4XDTIxMDMyMjE0NDkzOVoXDTI0MDMy
             MTE0NDkzOVowHzEdMBsGA1UEAxMUc2VjdXJlLm91cmlnaW5hbC5jb20wggGiMA0G
             CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC550nQZxq1RT2zjHgVbuNSKhwO9ZV3
@@ -50,8 +50,7 @@
             113AdDFEaRq2x/l1vmU2D/w8+4XelzVun/SnFAJzErAazeIc2Nz41VZebMkuPFPZ
             IACDq/DGqFrAC7kNLyJFLlWmGGx+w3Fpc+FHR+EVrGo02SMI/psoBHpWzW+fWMYj
             GkfCrw/lhLj11MulWcRDXUHFBTtPXQndPlSAzieUMDivAa/5Fv8zwN18S0PSYYKW
-            nNaWqKa98JgdG4fsjLwlCWdmMobwZyIpiNTX1nMgfIx5UQWOLihgbMzoM8m5
-          </ds:X509Certificate>
+            nNaWqKa98JgdG4fsjLwlCWdmMobwZyIpiNTX1nMgfIx5UQWOLihgbMzoM8m5</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -60,8 +59,7 @@
         <ds:KeyName>secure.ouriginal.com</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=secure.ouriginal.com</ds:X509SubjectName>
-          <ds:X509Certificate>
-            MIIEGTCCAoGgAwIBAgIJAPuiM7HVLa95MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+          <ds:X509Certificate>MIIEGTCCAoGgAwIBAgIJAPuiM7HVLa95MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
             BAMTFHNlY3VyZS5vdXJpZ2luYWwuY29tMB4XDTIxMDMyMjE0NDkzOVoXDTI0MDMy
             MTE0NDkzOVowHzEdMBsGA1UEAxMUc2VjdXJlLm91cmlnaW5hbC5jb20wggGiMA0G
             CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC550nQZxq1RT2zjHgVbuNSKhwO9ZV3
@@ -82,8 +80,7 @@
             113AdDFEaRq2x/l1vmU2D/w8+4XelzVun/SnFAJzErAazeIc2Nz41VZebMkuPFPZ
             IACDq/DGqFrAC7kNLyJFLlWmGGx+w3Fpc+FHR+EVrGo02SMI/psoBHpWzW+fWMYj
             GkfCrw/lhLj11MulWcRDXUHFBTtPXQndPlSAzieUMDivAa/5Fv8zwN18S0PSYYKW
-            nNaWqKa98JgdG4fsjLwlCWdmMobwZyIpiNTX1nMgfIx5UQWOLihgbMzoM8m5
-          </ds:X509Certificate>
+            nNaWqKa98JgdG4fsjLwlCWdmMobwZyIpiNTX1nMgfIx5UQWOLihgbMzoM8m5</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -102,6 +99,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.ouriginal.com/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Ouriginal</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ouriginal</md:ServiceName>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -126,9 +124,4 @@
     <md:SurName>Forsberg</md:SurName>
     <md:EmailAddress>mailto:simon.forsberg@ouriginal.com</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johannes</md:GivenName>
-    <md:SurName>Knabe</md:SurName>
-    <md:EmailAddress>mailto:johannes.knabe@ouriginal.com</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-edugain/secure.urkund.com-shibboleth.xml b/swamid-edugain/secure.urkund.com-shibboleth.xml
index 5fe95bc4..ba9cbd17 100644
--- a/swamid-edugain/secure.urkund.com-shibboleth.xml
+++ b/swamid-edugain/secure.urkund.com-shibboleth.xml
@@ -6,8 +6,6 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
       <samla:Attribute 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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
@@ -27,70 +25,6 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.ouriginal.com/privacy-and-personal-data-protection-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>secure.urkund.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.urkund.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEIDCCAoigAwIBAgIJAM175O3X56OxMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXNlY3VyZS51cmt1bmQuY29tMB4XDTE5MDQyMzEwNDYxN1oXDTIyMDQyMjEw
-NDYxN1owHDEaMBgGA1UEAxMRc2VjdXJlLnVya3VuZC5jb20wggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDBOhMVU9W8PqL0WRYycNeV6cKAnstbxvFxCFSl
-rFhIMTHH+QENslh9vpaKMF5eNzkab9aWly5vJyc9V9WfmJHOaraJNvfOkZSeYIAy
-7P/X6V0oNS764MqtuNePspxO56uKf/d2TSeX1melQrmVHhQVoVHYSfrVbpIjRGtm
-muETsg/z/+oPUYSzWlC9ZtNzm+fif3rdn+XVN0X06UweuVkkK6TShrD56nJusn6K
-G4v7xgYIrLNxNJ+hgW7nsvZMqr0v0j7a7Ck13IvRAaDSsCtp8KP1hW+EQafIVt5h
-xsQGy8q3i1xCTt3YUlbvI5/2euZY7pdlGEAKaYjXqueSWI3CJwHkERyQV/R7s3lE
-dQdcLCRX+aJl1JnVuYhxmP87mSy87en0wNjJCTk6cRKh+i1PUA2oRYxChydAiy9Y
-kMwDVbP6+fLeXaprTXflusCde121jHFsXe89SnEThTpQRp9e8PTW4KG1PL23PNnY
-XZeze7khuE7GrqbaPFxJ9IQEFqcCAwEAAaNlMGMwQgYDVR0RBDswOYIRc2VjdXJl
-LnVya3VuZC5jb22GJGh0dHBzOi8vc2VjdXJlLnVya3VuZC5jb20vc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU9AUCbUiSJrIeQSo11qfGWdIWCfwwDQYJKoZIhvcNAQELBQAD
-ggGBAKsD2nA9ojwAv59oknvK7pIie0ZO+ZfQkPvkb5U+72s8hdiViCf3V/Z26uqx
-j/fuJocSGeci+32BGNqamjluR08N29tWVHUCsZHLQ363LL5EVIcgLyvH80Cg+wkC
-TWhQ/Kh9WpANIIWvjX6Yil4V7/vvqgPawDUU7zpiGqmKzUkU5O4C/THyWp/3MfBg
-PmmNtcQDUMjaHanVn/AaSyrDFSG/Fd5in3SmdVG2VJa3v2ZLARC2xcVNIWJ5Lcjx
-URXagp+xe4NIuGNlJI2C1EFZmcTPCi9iNpZrhiBXu3s2gTudju+nY3wQknIAGuha
-UueOkrrTpSEE3EpSJ3pRkDllE0AGfh/j9dCYQmabEXyYn2DV5JhYlCzWR+8FwVdU
-73IySbHpmS3JDuGNR71sVp7iBBruoxv0FTd4RYC5e/tBE73yUyQhX88A1BgkmFRN
-umOzMtf3gLrdIED3P+ylShHK0kAr3pTW1qhTH9EsLlPJw1+QE5CgBRmFvkjsqJrY
-Qkn4OQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>secure.urkund.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.urkund.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEIDCCAoigAwIBAgIJAM175O3X56OxMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXNlY3VyZS51cmt1bmQuY29tMB4XDTE5MDQyMzEwNDYxN1oXDTIyMDQyMjEw
-NDYxN1owHDEaMBgGA1UEAxMRc2VjdXJlLnVya3VuZC5jb20wggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQDBOhMVU9W8PqL0WRYycNeV6cKAnstbxvFxCFSl
-rFhIMTHH+QENslh9vpaKMF5eNzkab9aWly5vJyc9V9WfmJHOaraJNvfOkZSeYIAy
-7P/X6V0oNS764MqtuNePspxO56uKf/d2TSeX1melQrmVHhQVoVHYSfrVbpIjRGtm
-muETsg/z/+oPUYSzWlC9ZtNzm+fif3rdn+XVN0X06UweuVkkK6TShrD56nJusn6K
-G4v7xgYIrLNxNJ+hgW7nsvZMqr0v0j7a7Ck13IvRAaDSsCtp8KP1hW+EQafIVt5h
-xsQGy8q3i1xCTt3YUlbvI5/2euZY7pdlGEAKaYjXqueSWI3CJwHkERyQV/R7s3lE
-dQdcLCRX+aJl1JnVuYhxmP87mSy87en0wNjJCTk6cRKh+i1PUA2oRYxChydAiy9Y
-kMwDVbP6+fLeXaprTXflusCde121jHFsXe89SnEThTpQRp9e8PTW4KG1PL23PNnY
-XZeze7khuE7GrqbaPFxJ9IQEFqcCAwEAAaNlMGMwQgYDVR0RBDswOYIRc2VjdXJl
-LnVya3VuZC5jb22GJGh0dHBzOi8vc2VjdXJlLnVya3VuZC5jb20vc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU9AUCbUiSJrIeQSo11qfGWdIWCfwwDQYJKoZIhvcNAQELBQAD
-ggGBAKsD2nA9ojwAv59oknvK7pIie0ZO+ZfQkPvkb5U+72s8hdiViCf3V/Z26uqx
-j/fuJocSGeci+32BGNqamjluR08N29tWVHUCsZHLQ363LL5EVIcgLyvH80Cg+wkC
-TWhQ/Kh9WpANIIWvjX6Yil4V7/vvqgPawDUU7zpiGqmKzUkU5O4C/THyWp/3MfBg
-PmmNtcQDUMjaHanVn/AaSyrDFSG/Fd5in3SmdVG2VJa3v2ZLARC2xcVNIWJ5Lcjx
-URXagp+xe4NIuGNlJI2C1EFZmcTPCi9iNpZrhiBXu3s2gTudju+nY3wQknIAGuha
-UueOkrrTpSEE3EpSJ3pRkDllE0AGfh/j9dCYQmabEXyYn2DV5JhYlCzWR+8FwVdU
-73IySbHpmS3JDuGNR71sVp7iBBruoxv0FTd4RYC5e/tBE73yUyQhX88A1BgkmFRN
-umOzMtf3gLrdIED3P+ylShHK0kAr3pTW1qhTH9EsLlPJw1+QE5CgBRmFvkjsqJrY
-Qkn4OQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:KeyName>secure.ouriginal.com</ds:KeyName>
@@ -118,8 +52,7 @@ N1flf4PDMcwy0/dfsIo0HHxEBmvFXHM/Qf3qzTP07Mc8P9chJbeTKDQYMwB4mpaW
 dbuRnwpr95gHgf7iEsnUMI8bIMEeVfplz5XYvbSCCVbHHYSrlZHrSfm/9GmkSEwl
 zJimvo+O7RBJGFRgL39mTIVaJugQxDsA0gt8xJ/s1VAws7Fdci/LydoHwLKh4sKX
 SjR0JMXpw1VGuEcbAipJR5DLZcHmAUL/CnC4H6VMBk3YcWbDMrXBp6lMYBZ+jUMG
-78yMn9OWBIA8z6yRtw==
-</ds:X509Certificate>
+78yMn9OWBIA8z6yRtw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -150,8 +83,7 @@ N1flf4PDMcwy0/dfsIo0HHxEBmvFXHM/Qf3qzTP07Mc8P9chJbeTKDQYMwB4mpaW
 dbuRnwpr95gHgf7iEsnUMI8bIMEeVfplz5XYvbSCCVbHHYSrlZHrSfm/9GmkSEwl
 zJimvo+O7RBJGFRgL39mTIVaJugQxDsA0gt8xJ/s1VAws7Fdci/LydoHwLKh4sKX
 SjR0JMXpw1VGuEcbAipJR5DLZcHmAUL/CnC4H6VMBk3YcWbDMrXBp6lMYBZ+jUMG
-78yMn9OWBIA8z6yRtw==
-</ds:X509Certificate>
+78yMn9OWBIA8z6yRtw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-- 
cgit v1.2.3