changed to shib for irf idp

git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@300 0878fbc5-a6f2-46f6-b174-cb7b08c221d1

5 files changed, 126 insertions, 65 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 1de8ef53..d588ee05 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -95,8 +95,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-saml1.xml"/>
-  <xi:include href="swamid-1.0/idp1.irf.se-saml2.xml"/>
+  <xi:include href="swamid-1.0/idp1.irf.se.xml"/>
   <xi:include href="swamid-1.0/bibliometrics.ki.se.xml"/>
   <xi:include href="swamid-1.0/uu.test.diva-portal.org.xml"/>
   <xi:include href="swamid-1.0/idp.bth.se.xml"/>
diff --git a/swamid-1.0/idp1.irf.se-saml1.xml b/swamid-1.0/idp1.irf.se-saml1.xml
deleted file mode 100644
index 66488d76..00000000
--- a/swamid-1.0/idp1.irf.se-saml1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:mace:shibboleth:1.0 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-saml2.xml b/swamid-1.0/idp1.irf.se-saml2.xml
deleted file mode 100644
index dc42e0cf..00000000
--- a/swamid-1.0/idp1.irf.se-saml2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.irf.se/simplesaml/saml2/idp/metadata.php">
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0: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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.irf.se/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.irf.se/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRF</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik (SAML2)</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.xml
new file mode 100644
index 00000000..eceff84f
--- /dev/null
+++ b/swamid-1.0/idp1.irf.se.xml
@@ -0,0 +1,118 @@
+<EntityDescriptor entityID="https://idp1.irf.se/idp/shibboleth"
+                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUDUgsJu1D6gb4+kDANz5tcOSplvcwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMS5pcmYuc2UwHhcNMTAwMzA0MDg1MTExWhcNMzAw
+MzA0MDg1MTExWjAWMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJAG72c5M1JSe4kVpa1ieen4GH5MuTD9wd0nOvAS
+No4ujCMQzRxwmKvH/6iCSTcgWF3JP152+Hy72L3rJEMEIQ4lda6lYyYpTnp91F47
+hANKatKv5Z2iA3Y3n255uVO8KqiQSW3lM5DkQkoKuXtHnIgoFIt+qn/5ZQHXTSZT
+GfHN4t+CXaWrTBXzGkm+PzSoD6ZnkA+E6A/ZvDkHjGl3HQ6nLJdlHSE+HR0CnDuI
+lCxDZ2eZiENSTe4S6Z1SMsoIYhG5nIAb60VT/fB2vGuLmXiwWQzaBJKsJz8pyyfY
+NKKDpB+W1ixK3doJ9OorDGzwdtzYdr5sQ6vekSkGC8lXuxsCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMS5pcmYuc2WGImh0dHBzOi8vaWRwMS5pcmYuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFA1CgEUtOXGEXg9o04q4oUF5FXBgMA0GCSqGSIb3
+DQEBBQUAA4IBAQAa1NPQHqtJf47CfQq/ABetOf1LqFOhWCNAPfemvtP0N6GvpMV1
+Y9ptOBdgi3Y+NV15eig97M3mupZv+lav+eKxANqOhWwbQGr6YAY28UklqwaR/J+w
+gL91aQByFo9btppbpWnjZ2yZ6DVyqq2WeU2HPqhq1xRcJLvx/hx9maLq91rp/AZo
+q1glXVqMu1QOtq7smlabkRZ18Y8EBTckyXuG9o/HdBRDO0FS0vxyHQW4Q8mFDhwW
+kpGbO3Z+eXiKro3oRuYSbhOXBocLqwTqVmWOV0cDyY2us+oI5TY4P9eLz3SdKzfG
+TWhOgNKm+P4FlWAicAdlhDlXaPsIWIWzCEgy
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://idp1.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   index="2"/>
+                                   
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
+                             Location="https://idp1.irf.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://idp1.irf.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://idp1.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://idp1.irf.se/idp/profile/SAML2/Redirect/SSO" />
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUDUgsJu1D6gb4+kDANz5tcOSplvcwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMS5pcmYuc2UwHhcNMTAwMzA0MDg1MTExWhcNMzAw
+MzA0MDg1MTExWjAWMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJAG72c5M1JSe4kVpa1ieen4GH5MuTD9wd0nOvAS
+No4ujCMQzRxwmKvH/6iCSTcgWF3JP152+Hy72L3rJEMEIQ4lda6lYyYpTnp91F47
+hANKatKv5Z2iA3Y3n255uVO8KqiQSW3lM5DkQkoKuXtHnIgoFIt+qn/5ZQHXTSZT
+GfHN4t+CXaWrTBXzGkm+PzSoD6ZnkA+E6A/ZvDkHjGl3HQ6nLJdlHSE+HR0CnDuI
+lCxDZ2eZiENSTe4S6Z1SMsoIYhG5nIAb60VT/fB2vGuLmXiwWQzaBJKsJz8pyyfY
+NKKDpB+W1ixK3doJ9OorDGzwdtzYdr5sQ6vekSkGC8lXuxsCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMS5pcmYuc2WGImh0dHBzOi8vaWRwMS5pcmYuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFA1CgEUtOXGEXg9o04q4oUF5FXBgMA0GCSqGSIb3
+DQEBBQUAA4IBAQAa1NPQHqtJf47CfQq/ABetOf1LqFOhWCNAPfemvtP0N6GvpMV1
+Y9ptOBdgi3Y+NV15eig97M3mupZv+lav+eKxANqOhWwbQGr6YAY28UklqwaR/J+w
+gL91aQByFo9btppbpWnjZ2yZ6DVyqq2WeU2HPqhq1xRcJLvx/hx9maLq91rp/AZo
+q1glXVqMu1QOtq7smlabkRZ18Y8EBTckyXuG9o/HdBRDO0FS0vxyHQW4Q8mFDhwW
+kpGbO3Z+eXiKro3oRuYSbhOXBocLqwTqVmWOV0cDyY2us+oI5TY4P9eLz3SdKzfG
+TWhOgNKm+P4FlWAicAdlhDlXaPsIWIWzCEgy
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://idp1.irf.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        
+    </AttributeAuthorityDescriptor>
+  <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/sp-test.swamid.se.xml b/swamid-1.0/sp-test.swamid.se.xml
index 6886e321..07236775 100644
--- a/swamid-1.0/sp-test.swamid.se.xml
+++ b/swamid-1.0/sp-test.swamid.se.xml
@@ -1,5 +1,12 @@
 
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.swamid.se/shibboleth">
+  <md:Extensions>
+     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+        <saml:Attribute Name="tag">
+           <saml:AttributeValue>test</saml:AttributeValue>  
+        </saml:Attribute>
+     </mdattr:EntityAttributes>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS" index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"/>