https://callback-prod.inloggning.se/authify/metadata/?fed_name=swamidfederation into swamid-interfederations-2.0

3 files changed, 84 insertions, 101 deletions

diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 00248979..121416ef 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -45,6 +45,7 @@
 <xi:include href="swamid-interfederations-2.0/e5.onthehub.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/eaa.uspnet.usp.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml"/>
+<xi:include href="swamid-interfederations-2.0/elegitimation2.inloggning.se.xml"/>
 <xi:include href="swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/ephraim.tu-berlin.de.xml"/>
diff --git a/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml b/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
new file mode 100644
index 00000000..efcec127
--- /dev/null
+++ b/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/metadata.php/virtual_sp_for_swamid_uu">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEsDCCBBmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8DELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxSDBGBgNVBAsUP1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVV9TdmVJRDElMCMGA1UEAxMcU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTAgFw0xMjEyMTEyMjE4MjhaGA8yMDU1MDEwNTIyMTgyOFowgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJgNj1MBi3HtyKLiiZQq4Ks0yMhk+XX5D1lXcL7r7G94s3w6cPteJZFR2/1DsARbR19SLtoG+zn7iLu5bagpIr906023MVKOc9l6zPuoMtQ71VUVsXmWdgFXTR2qln9eqE4cayuYkv2OxwrRLVa2fe3dyVksCb59Mpw3hiTpP8Q5AgMBAAGjggFUMIIBUDAdBgNVHQ4EFgQUkZFvxByU7cCnZCBjw1B6VypLOn0wggEfBgNVHSMEggEWMIIBEoAUkZFvxByU7cCnZCBjw1B6VypLOn2hgfakgfMwgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQA+7VYhtODAKIhU4s8kZh1aZuS8oLjYcUksLEFBXyTICHW7Z9UEpiWiMyIOvjS5CVpNoJxglmoNOia+Aq8b9Rrp3PBx8AZ7FNfOeBiznbMi76m2rF2GVFO2WqWORA2N/Ip+YChecbMEB31KoG1HTatvpjI8T+c147pH8FmBRA0PBA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEsDCCBBmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8DELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxSDBGBgNVBAsUP1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVV9TdmVJRDElMCMGA1UEAxMcU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTAgFw0xMjEyMTEyMjE4MjhaGA8yMDU1MDEwNTIyMTgyOFowgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJgNj1MBi3HtyKLiiZQq4Ks0yMhk+XX5D1lXcL7r7G94s3w6cPteJZFR2/1DsARbR19SLtoG+zn7iLu5bagpIr906023MVKOc9l6zPuoMtQ71VUVsXmWdgFXTR2qln9eqE4cayuYkv2OxwrRLVa2fe3dyVksCb59Mpw3hiTpP8Q5AgMBAAGjggFUMIIBUDAdBgNVHQ4EFgQUkZFvxByU7cCnZCBjw1B6VypLOn0wggEfBgNVHSMEggEWMIIBEoAUkZFvxByU7cCnZCBjw1B6VypLOn2hgfakgfMwgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQA+7VYhtODAKIhU4s8kZh1aZuS8oLjYcUksLEFBXyTICHW7Z9UEpiWiMyIOvjS5CVpNoJxglmoNOia+Aq8b9Rrp3PBx8AZ7FNfOeBiznbMi76m2rF2GVFO2WqWORA2N/Ip+YChecbMEB31KoG1HTatvpjI8T+c147pH8FmBRA0PBA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-logout.php/virtual_sp_for_swamid_uu"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/virtual_sp_for_swamid_uu" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/virtual_sp_for_swamid_uu" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/virtual_sp_for_swamid_uu" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/virtual_sp_for_swamid_uu/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Svensk e-identitet AB via UU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Svensk e-identitet AB via UU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mikael</md:GivenName>
+    <md:SurName>Westoo</md:SurName>
+    <md:EmailAddress>mikael.westoo@e-identitet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid.user.uu.se.xml b/swamid-interfederations-2.0/swamid.user.uu.se.xml
index 322db378..a347f79e 100644
--- a/swamid-interfederations-2.0/swamid.user.uu.se.xml
+++ b/swamid-interfederations-2.0/swamid.user.uu.se.xml
@@ -1,44 +1,13 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.user.uu.se/idp/shibboleth">
-<md:Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-<mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</md:Extensions>
-
-    <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-  	       <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
-               <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
-               <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-               <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
-               <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
-               <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
-               <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
-            </mdui:UIInfo>
-            <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-               <mdui:DomainHint>uu.se</mdui:DomainHint>
-               <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-               <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-               <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-               <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-               <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-               <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-               <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-               <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint> 
-               <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint> 
-               <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-            </mdui:DiscoHints>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://swamid.user.uu.se/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
 M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -55,40 +24,27 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
 Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
 lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
 L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.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://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+2DlT+A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
 M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -105,31 +61,23 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
 Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
 lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
 L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-        <OrganizationName xml:lang="en">UU</OrganizationName> 
-        <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName> 
-        <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL> 
-    </Organization>
-<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-        <Company>Uppsala universitet</Company> 
-        <SurName>AKKA SAML2</SurName> 
-        <EmailAddress>akka-datordrift@its.uu.se</EmailAddress> 
-    </ContactPerson>
+2DlT+A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>AKKA SAML2</md:SurName>
+    <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>