summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-1.0.mxml3
-rw-r--r--swamid-1.0/idp1.irf.se-saml1.xml31
-rw-r--r--swamid-1.0/idp1.irf.se-saml2.xml (renamed from swamid-1.0/idp1.irf.se.xml)2
3 files changed, 34 insertions, 2 deletions
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 6f7c940b..448c18ac 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -97,6 +97,7 @@
<xi:include href="swamid-1.0/su-cal-nightly-app1.it.su.se.xml"/>
<xi:include href="swamid-1.0/cal-nightly.it.su.se.xml"/>
<xi:include href="swamid-1.0/cal-dev.it.su.se.xml"/>
- <xi:include href="swamid-1.0/idp1.irf.se.xml"/>
+ <xi:include href="swamid-1.0/idp1.irf.se-saml1.xml"/>
+ <xi:include href="swamid-1.0/idp1.irf.se-saml2.xml"/>
<xi:include href="swamid-1.0/bibliometrics.ki.se.xml"/>
</EntitiesDescriptor>
diff --git a/swamid-1.0/idp1.irf.se-saml1.xml b/swamid-1.0/idp1.irf.se-saml1.xml
new file mode 100644
index 00000000..b67132f4
--- /dev/null
+++ b/swamid-1.0/idp1.irf.se-saml1.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.irf.se/simplesaml/shib13/idp/metadata.php">
+ <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEfTCCA2WgAwIBAgIQWfUXyWnBHNR8TAe6TroxSzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTA5MTEwOTAwMDAwMFoXDTEyMTEwODIzNTk1OVowXTELMAkGA1UEBhMCU0UxIjAgBgNVBAoMGUluc3RpdHV0ZXQgZsO2ciByeW1kZnlzaWsxFDASBgNVBAsTC0RhdGFncnVwcGVuMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALc79ZV4GrzTT/g6Eh74Ev4tKEl9aVqSuu1lzotkCtd08rr5vRxjtNO6+sEJyKd3ACNjcCBPi1BHIEHKZQT1iiMSPWGIhi4oxIMOM4QFw/fIk0OA3sl2Som0Avkvtfhv2OPh8AeUBpzNVqMfJOct7MgtVOAphSOnMz+vS8CPJbQtsykw3uJXbBPz9FTDq/XRBf6QUD21TM1daHMq4Ngf0iS4Mt6omqgASz4yl1QEID2y1+9uZ5TALa7qWQGdAG2bv5HztbH3HmYoOkifaAr8FVSP10dZb6qD8OEg4RzCmxehdgMDGukuIAslUqiz1Sx52zqK6vlzMX54lr0R6MeUlVkCAwEAAaOCAV4wggFaMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSW90Cik0MFlkdqvYVwFC9lg/GINjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAWBgNVHREEDzANggtpZHAxLmlyZi5zZTANBgkqhkiG9w0BAQUFAAOCAQEAAY7DkkQN8Wf2xyA4SpUfv47eyBbf9eU53n/SMMHWYvQ+s03yzELe3LItqlZTlSQNorVEQni+F8PkCepAcMAFVF1wRGwR1eWSW5BRPz3Wsj9qDijrweNy3MPIF0wTLcUCujJ+KeXqcd1HEkm3Gq5np06K9zQQNHFvP9T3dYdrkeqlws+Z0Uto4Ic3OjtkKsQCHY0rv5T2y36KqyMzmvvnuYGpmwHWZe509JQlQi/ycdaKtMhOkSZh2VWgcIkbCQY7jrYDgbae+esF3OGa/fCE88mvYmdYA6KH0D73NE8OHPBHzG5apqCYEl+9yQ+3/SyhQ3LNo9b/tf1+/xP9P3a50A==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEfTCCA2WgAwIBAgIQWfUXyWnBHNR8TAe6TroxSzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTA5MTEwOTAwMDAwMFoXDTEyMTEwODIzNTk1OVowXTELMAkGA1UEBhMCU0UxIjAgBgNVBAoMGUluc3RpdHV0ZXQgZsO2ciByeW1kZnlzaWsxFDASBgNVBAsTC0RhdGFncnVwcGVuMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALc79ZV4GrzTT/g6Eh74Ev4tKEl9aVqSuu1lzotkCtd08rr5vRxjtNO6+sEJyKd3ACNjcCBPi1BHIEHKZQT1iiMSPWGIhi4oxIMOM4QFw/fIk0OA3sl2Som0Avkvtfhv2OPh8AeUBpzNVqMfJOct7MgtVOAphSOnMz+vS8CPJbQtsykw3uJXbBPz9FTDq/XRBf6QUD21TM1daHMq4Ngf0iS4Mt6omqgASz4yl1QEID2y1+9uZ5TALa7qWQGdAG2bv5HztbH3HmYoOkifaAr8FVSP10dZb6qD8OEg4RzCmxehdgMDGukuIAslUqiz1Sx52zqK6vlzMX54lr0R6MeUlVkCAwEAAaOCAV4wggFaMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSW90Cik0MFlkdqvYVwFC9lg/GINjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAWBgNVHREEDzANggtpZHAxLmlyZi5zZTANBgkqhkiG9w0BAQUFAAOCAQEAAY7DkkQN8Wf2xyA4SpUfv47eyBbf9eU53n/SMMHWYvQ+s03yzELe3LItqlZTlSQNorVEQni+F8PkCepAcMAFVF1wRGwR1eWSW5BRPz3Wsj9qDijrweNy3MPIF0wTLcUCujJ+KeXqcd1HEkm3Gq5np06K9zQQNHFvP9T3dYdrkeqlws+Z0Uto4Ic3OjtkKsQCHY0rv5T2y36KqyMzmvvnuYGpmwHWZe509JQlQi/ycdaKtMhOkSZh2VWgcIkbCQY7jrYDgbae+esF3OGa/fCE88mvYmdYA6KH0D73NE8OHPBHzG5apqCYEl+9yQ+3/SyhQ3LNo9b/tf1+/xP9P3a50A==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.irf.se/simplesaml/shib13/idp/SSOService.php"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">IRF</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="technical">
+ <GivenName>Mats</GivenName>
+ <SurName>Luspa</SurName>
+ <EmailAddress>matsl@irf.se</EmailAddress>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-1.0/idp1.irf.se.xml b/swamid-1.0/idp1.irf.se-saml2.xml
index 7cf82ed4..dc42e0cf 100644
--- a/swamid-1.0/idp1.irf.se.xml
+++ b/swamid-1.0/idp1.irf.se-saml2.xml
@@ -21,7 +21,7 @@
</IDPSSODescriptor>
<Organization>
<OrganizationName xml:lang="en">IRF</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik (SAML2)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">