SWAMID-809 Updated login.idp.eduid.se

2 files changed, 97 insertions, 133 deletions

diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
index 31890d42..67a37024 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
@@ -4,41 +4,42 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-25T15:54:30Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla: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-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <ns0:IDPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.idp.eduid.se/idp.xml">
-    <ns0:Extensions>
-      <ns1:Scope xmlns:ns1="urn:mace:shibboleth:metadata:1.0" regexp="false">eduid.se</ns1:Scope>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.idp.eduid.se/idp.xml">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">eduid.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">eduID Sverige</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">eduID Sweden</mdui:DisplayName>
         <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
         <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://eduid.se/faq.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://eduid.se/en/faq.html</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://eduid.se/faq.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://eduid.se/en/faq.html</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
         <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
       </mdui:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
 RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
 MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
 EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
@@ -57,14 +58,14 @@ q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
 eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
 FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
 iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
 RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
 MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
 EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
@@ -83,39 +84,41 @@ q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
 eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
 FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
 iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.eduid.se/slo/soap"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/slo/post"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/slo/redirect"/>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">Sunet</ns0:OrganizationName>
-    <ns0:OrganizationName xml:lang="sv">Sunet</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID Sweden</ns0:OrganizationDisplayName>
-    <ns0:OrganizationDisplayName xml:lang="sv">eduID Sverige</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <ns0:Company>eduID</ns0:Company>
-    <ns0:SurName>Valter Nordh</ns0:SurName>
-    <ns0:EmailAddress>mailto:valter@sunet.se</ns0:EmailAddress>
-    <ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:Company>eduID</ns0:Company>
-    <ns0:SurName>SUNET eduID team</ns0:SurName>
-    <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:Company>eduID</ns0:Company>
-    <ns0:SurName>eduID Support</ns0:SurName>
-    <ns0:EmailAddress>mailto:support@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.eduid.se/slo/soap"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/slo/post"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/slo/redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Sunet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fresia</md:GivenName>
+    <md:SurName>Pérez</md:SurName>
+    <md:EmailAddress>mailto:fresia@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SUNET eduID team</md:GivenName>
+    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>eduID Support</md:GivenName>
+    <md:EmailAddress>mailto:support@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Sunet CERT</md:GivenName>
+    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
index 29df1d55..3777afc1 100644
--- a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml
@@ -9,30 +9,22 @@
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://miunidptest.miun.se/idp/shibboleth">
-    <md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://miunidptest.miun.se/idp/shibboleth">
+    <Extensions>
       <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Mittuniversitetet (test)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">IDP för test på Mittuniversitetet</mdui:Description>
         <mdui:DisplayName xml:lang="en">Mid Sweden University (test)</mdui:DisplayName>
         <mdui:Description xml:lang="en">IDP for testing at Mid Sweden University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="146" width="260">https://miunidptest.miun.se/idp/images/miun-logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="260">https://miunidptest.miun.se/idp/images/miun-logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
+        <!--
+                <mdui:Logo height="80" width="80">https://miunidptest.miun.se/Path/To/Logo.png</mdui:Logo>
+-->
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -57,8 +49,8 @@ Q2DB2f7ifMpnsvw=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -83,8 +75,8 @@ p8Zy6HNa1RvGgW8P
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -109,25 +101,25 @@ YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <!--
         <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidptest.miun.se/idp/profile/SAML2/Redirect/SLO"/>
         <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidptest.miun.se/idp/profile/SAML2/POST/SLO"/>
         <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/SLO"/>
         -->
-    <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://miunidptest.miun.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidptest.miun.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidptest.miun.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
+    <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://miunidptest.miun.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidptest.miun.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidptest.miun.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">
+    <Extensions>
       <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -152,8 +144,8 @@ Q2DB2f7ifMpnsvw=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -178,8 +170,8 @@ p8Zy6HNa1RvGgW8P
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -204,40 +196,9 @@ YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.miun.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.miun.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>Systemdrift/Operations, INFRA</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>Systemdrift/Operations, INFRA</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Mid Sweden University Incident Manager</md:GivenName>
-    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
-    <md:TelephoneNumber/>
-  </md:ContactPerson>
+  </AttributeAuthorityDescriptor>
 </md:EntityDescriptor>