summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-2.0/datasets.sunet.se-shibboleth.xml36
-rw-r--r--swamid-2.0/idp.irf.se-idp-shibboleth.xml2
-rw-r--r--swamid-idp-2.0.mxml2
3 files changed, 18 insertions, 22 deletions
diff --git a/swamid-2.0/datasets.sunet.se-shibboleth.xml b/swamid-2.0/datasets.sunet.se-shibboleth.xml
index c618002d..6f8de649 100644
--- a/swamid-2.0/datasets.sunet.se-shibboleth.xml
+++ b/swamid-2.0/datasets.sunet.se-shibboleth.xml
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://datasets.sunet.se/shibboleth">
<md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -38,22 +34,22 @@ and do *NOT* provide it in real time to your partners.
<ds:KeyName>datasets.sunet.se</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=datasets.sunet.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAMvmcAhVMI/vMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWRhdGFzZXRzLnN1bmV0LnNlMB4XDTE0MTEyOTE2MDczNVoXDTI0MTEyNjE2
-MDczNVowHDEaMBgGA1UEAxMRZGF0YXNldHMuc3VuZXQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDfoKkZExgsgIA3B6dtf/KqRWuKV1S1pOGUc+BJ
-MfhK6sqlAvqmulZdxuWXiAMeWijnIaQKo/dCCknkXAw6pjpcDzKH3/3NPtAIJo3e
-HtkpmgdZ2Mn0EbnLYMBml1ex12m3MWBULDTOqmvwg4bXcNctUGYKEfOnfQElnsZn
-eukuVT9fnICfoQ+Q4cQFs4xXMOyX6tmVXewWGEt7nLKjB5ki3BKZLh38e+TyXMWk
-JFR7coBQ07WBBwKxUp8Auaqn9F5/K3l+DpEm7lzw1vBzEc9E6qFY/uHQpCDJKsJ9
-ERxZ0/alJtRhMrUsWA9l3ZMepeTccxHbWTE695ddzY7fLfLrAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWRhdGFzZXRzLnN1bmV0LnNlMB0GA1UdDgQWBBR4ejaC0DBo8vrP
-EmXiRdH+CziYCjANBgkqhkiG9w0BAQUFAAOCAQEAYC+SM6gMiBwIpkNOixjI/csH
-Prz7GypFYdT9vJJSC1CiJIpoQo7nMDVON3BIs0wAjvrx2psJ8way/pWzYbRhPdVK
-WkSqOg5AphZJZ+zUOFKkFBBF+fhfKC77i1IfxatpKhyrYkDKE63ufzBpCXaAowDa
-WcJf0PsiUUH2yK1Z0SWAR3Xbti5KRqqA64SMFIUKfiAEFdJlQ+1AFDz5pS4N13zN
-rqj3mjyfdu7F6K2FqHVg6Jza3YHEO5mNSOLB4MpWLdhMxq9Tzv4wIeF8anbKSlDo
-SFTz2brDLzUEIO3lt6p+Xo5YeuMYoojCZKixJIpCB2TI6cet72dtXYOKuXWsqg==
+ <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAPzAlxKPYTw3MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWRhdGFzZXRzLnN1bmV0LnNlMB4XDTE1MDkxNjA4MjU0M1oXDTI1MDkxMzA4
+MjU0M1owHDEaMBgGA1UEAxMRZGF0YXNldHMuc3VuZXQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCuZGVdZIHFznevZLKckdbgYwu4Cb+B0M6YswGv
+qxAM29BWVbk8wdASB/8dThtEjX7GLhFpy3L59JMluBFZHub73kqcHxnX+dYDNiAE
+nYsthoVf3rx7j6gTqH1YNsfJYkcokVwxVCvTyPLyjIk0gZHp8WFrPdqNpl/YajX+
+a5TtkMrhjgTWyA/cUSfnoDQqtJmfyz+0fp+I8sirma7i4W5QMrIllIEniyjFOKGc
+WO/LqY5RweMLpMe2VSizrp4JfgbY5ilei9YHaVZHfSJW0ezC59bO3Hlw43Wt3uCb
+KxPMPYpyDUqgW19a4mtbxQj5n6PC80/dqR1b/VfyOk8xI5zdAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEWRhdGFzZXRzLnN1bmV0LnNlMB0GA1UdDgQWBBQvAJ/2+qj0VzNn
+kpAMYo69KlcbXTANBgkqhkiG9w0BAQUFAAOCAQEAH0dYbfY5hsGZn7KGPda9Bvbo
+Rl7rt39To9O5IrYwc7/FEgbuIOzjCDdx5Eeo+khhz9WEWv6jCMIMtZoHdqWHkcAn
+f2rTykgCw4Sck95sQT/Euw4wLtcrIOugwvVfGq9NfABJN8jGzJJtWkGhOxxn8QvQ
+YIHckCom/BLu632ON+EMgKnouow4xlfsruXbaFMC8w/dS8MPFnzTa36HccqJ65WS
+ExH64IKAxSKgB0qIQrXyRK6v0oeHL+gFsx5aOuMScLXg7xLckD+xPEh+6G50mgKR
+2nnLFf/3OslGE3stQ+W+ofQTzHQA/3+3jlPtiuWzWoRrnIClym29edoJUg/2Gg==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index 40fcd188..f8defe10 100644
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
@@ -101,7 +101,7 @@ XCYbfP8E3cs4MB+K
<ContactPerson contactType="administrative">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
- <EmailAddress>datagruppen@irf,se</EmailAddress>
+ <EmailAddress>datagruppen@irf.se</EmailAddress>
<TelephoneNumber>+4698079000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 23566bb2..b08b1d00 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -6,6 +6,6 @@
<!-- Opt-out from eduGAIN IDP:s -->
<xi:include href="swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
- <xi:include href="swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
+ <!-- xi:include href="swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml"/ -->
<xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
</md:EntitiesDescriptor>