summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Mattsson <bjorn@sunet.se>2021-06-11 14:52:17 +0200
committerBjörn Mattsson <bjorn@sunet.se>2021-06-11 14:52:17 +0200
commita816e8b1ece95eecf99d579188a02caeeecdc358 (patch)
tree91b047cd28cafa573f6b8f0e776de2ac93dfef88
parent1f7e7ca9b5f4b56336fd5748529e3add2e693b26 (diff)
parent8e9f6602836dbb703c0e8265eb34b7da799fdf57 (diff)
Merge branch 'master' of git.swamid.se:swamid-metadata
-rw-r--r--swamid-2.0/student.integrationstest.ladok.se-student-sp.xml7
-rw-r--r--swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml6
2 files changed, 4 insertions, 9 deletions
diff --git a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
index daa420cf..173a60a7 100644
--- a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.integrationstest.ladok.se/student-sp">
<md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-12-13T09:59:05Z">
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-10T13:58:57Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -22,9 +22,6 @@
<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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
@@ -113,7 +110,7 @@
<md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Ladok-supporten</md:SurName>
- <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46907866600</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml b/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml
index 3f5db2ed..a38f3bfe 100644
--- a/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.integrationstest.ladok.se/gui-sp">
<md:Extensions>
- <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-12-13T09:59:05Z">
+ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-10T13:58:57Z">
<mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
</mdrpi:RegistrationInfo>
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -22,8 +22,6 @@
<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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
@@ -113,7 +111,7 @@
<md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
<md:Company>ITS, Umeå universitet</md:Company>
<md:SurName>Ladok-supporten</md:SurName>
- <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46907866600</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>