SWAMID-1189: New certs for ladok3-00 and ladok3-01

4 files changed, 16 insertions, 16 deletions

diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index cbed5d41..232ecf4b 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-00.ladok.umu.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -25,6 +22,9 @@
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </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>
@@ -49,7 +49,7 @@
         <ds:KeyName>ladok3-00.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJANyLphmqAiCsMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwNDAyWhcNMjIwNjI0MTMwNDAyWjAhMR8wHQYDVQQDExZsYWRvazMtMDAubGFkb2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4lukmN1u10uEnOWVd7LjVUjl9U0U4UKGSy8/zJBKqatk5E+JW6LVB9wZDx85kUPOrflBc72brXWx2x03yne06X6nYwr7a1Gp2bQKyw8IuXAxoTgG6IYEWtpoFmX/IKkOwCgb9qBnaije51BKDbFz9GMyn7FaSy6lHm5QrzYAXJDKippsEInJYEChhjYNuFImGySYxYVkmgqXVqW7caZYOwQCxERDtsPJwUluO8dRbzzcmQxlhstzr0GQkAnwodtP9cCmvO2SUboNVbxNQmL4Er9DVzn+EiTW1jZaYOfQi+BfLSwZt/aWPBLMg2q3voeu3u7gCyMGcdN3SoG8dEoU4QIDAQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDAubGFkb2sudW11LnNlhiVodHRwczovL2xhZG9rMy0wMC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBS8Q9ehYSdw4S9o1UfOdXlrgS5owTANBgkqhkiG9w0BAQUFAAOCAQEAM3LCbyt/tuBMlNapX3OCJlCz/sQOiSbDgG154z3VzXLVYM1seUjCFWwPpO7kw3hS0kvNxAEQS59eaJkDMIno0z+OT3OTnr30ERGZAVZ4cX79Ww2nX1mtWJN1WB9M40XeUFXGIvoVR5LckNyHax8gu3I2/RzG8yS0F4fH5Kz1eDZaaSBtQV2mWkps3x4fEOvh3qFc373bUmL1Ms2geWORbwxcAgGd59kxtofZzDjrx6o2qT8ELV5iD7yQteLe91Flh1/5U07EXlvJLMz3kqFto5NOuXUYh/srUMR0mzAVUbECgIbU7Os7gpUno65QsP8rJEdwHzig9WNLpoy0w5aKug==</ds:X509Certificate>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMLiHS4a6f9OMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjQ2WhcNMzIwODE2MTMxNjQ2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzwX6vTkOZoSmumLJh9cKTPUPMCZK69k/e3S9A9Am2zmbKn0Wrtmz5fKdmnxCfRUITAa2mopyXu0z6aQbF4D/qpYg1ihD5rBfYAi0diNIa/evlSkLQYXX+NboTQuXoEd3vdTELC8b0ycp+7wh3Lj6ATYvEKpc7Vi5QlV8rdXOs9QpmUKmK4v7XBffUrYxMEcktk1mgJnCX5Nbdd2F4ln7mWRN0zoh1BYvq+prLvMMQPTJLFRhltDq1dTjLlw1haULY/ckr2sTGm5ookxADd94Wp2LKSwlRsIrx9wikJKpjFkqk7LO6L+pxEHNRIf4/dRqFj7IMeV5ZTKqJfiQS9YVqu7JTQuO5nUZb2krSrajZxOgmlgaOki9qFx4sdoPi8Rp6OkBXTQ4piJkzS8qvtwkE7ByoQ6koT3tineYNAbceZmniClya5z6J+oiESOQFg3cYQt8MRZS0EwXpAiHS9z0mfQG7dBczPP1RL/JCZA7ALRlmx/Ygk/tXdahLsHUBtHVb8w1W54Ab2pNgDol/XPpW1Zc4SgQhLcuWJaz7UI+DkV5yAsesT6C0/hhnqdKBTE2jvbKZpfW8o3Hb2E2q1FlgO3t4osfEHHQUqPqGUkAv17DVmuX+HfIVrqGXG8nVbwv9g9FYt2MQjjFzcaaCEJWPreUy7Wm4G8uJHHmx64pclcCAwEAAaNQME4wHQYDVR0OBBYEFDPf15zdA77UoC+hecrvpp879O0AMB8GA1UdIwQYMBaAFDPf15zdA77UoC+hecrvpp879O0AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGoCDhK02cEXdZEhe7Fv0A2wZ1xsrA+GTAMesA4dR9BOreLbHWsE57EWw1TQa7624JyJ3B28KG+pnC7N1LGWEAmUinYfd/9scjKCOHMUURhK5oM/VM8ILeA/B2+u8jEM4jikmSmztv2+CBDFV4LtFxd52BIimDwGRef504IjHfQ/6bQifOsjIWEWonzpLk4ds1UVQlRtiSx5npbeIRunAEQ5oVuLMix2vcyWaWD2qLjrHcy81/V/kbo4ke6LUN5Ijk3LHk0CFMghA8RpPRI0nsv3X/DSb8oHeLGvp6oFgqfiMkEZJK3kCqCMf7Iwda88ltqoLOGmLZ6D9wyX4Hc90PO0UBPuCuWxdhEe6tTO1c45Q/8UvPfoPmYU8VklQEtRwVGeBuXhr1rrPOtsQqKZ+fO8a3vv0mIEJi+IRtGuepZTceinZelc258NmapUTAiuUFVkXmvTPl+wa5hiUkO7zzC9154HpzoZ0vQ7jSczkT/HotT6ky1GJtNcStNKuzlvUG5i7DEZMjyAuaFbx/vy0hRahUefzaZqXeNl31+Vac7rekOHATmgkivaOppqFYEVroG7bwpridNUwrL5/kMYc2IvtmK9tDA7GOcsRFG5T4KO2RBy0t9YPuCoqobGqBgWE9MAqXsomGrinXsEPBlTKJb9PNcmqRueQjubkhx3BPmo</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
index d95cd9f3..03a60f42 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-00.ladok.umu.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -25,6 +22,9 @@
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </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>
@@ -49,7 +49,7 @@
         <ds:KeyName>ladok3-00.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJALaiCJSP55zsMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTQwOTI1MDk1NjA1WhcNMjQwOTIyMDk1NjA1WjAhMR8wHQYDVQQDExZsYWRvazMtMDAubGFkb2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7pXel9V/9/sPCh3YGFGK09GL6Rc5jCccGNqjWKOr7bPuPfami/UltfcDmKR24ka5540N1F1vMoRa5Jy2SpSw+flaSTRZgI1i4CwVFEbblwirdS2VTnuv04VVnuXI46mW6p6Purr41z8d6W6fUo5Q0EvN6KtTnl6EoIQoAMh8Fe5WuZOkggYtvaJAWWaVtYaqxw4duhhNHRbOmxVA6G7VfH5IPzt+C6W2F42QoOXcNQPnz7xkQHa22vxPk0rAiOI166YeA/ytUs7/svY7P3OnUuss7nUYGOPe9sa5Y11vVD95D42zSbewLFda0aSPSCr7FUkYdOUIZcWGDPJG/o5OQIDAQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDAubGFkb2sudW11LnNlhjJodHRwczovL2xhZG9rMy0wMC5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAdBgNVHQ4EFgQUVikKoyndXo08xCDD2jx853IrnhcwDQYJKoZIhvcNAQEFBQADggEBAAdVurbu0mBd3/p5QBPuYP+pTOQ3ABr6yakpfVbSybGpaKfyf2MZlOHu2LMprbNvtvzzAXzrOj0C21pz1dnQEOFNRGtCg+bHdWpgP0NzJl+kwNyztSWoxGmpVziSPI3sz+Kc0rAVF4588jsHJ4JMqeEwaHSBrX5lEYFIa/V/aInyF1N69RCNffSwYajhpX0X5Q7G3gNErTdpY7VyESfIjKrDNoyNva5oBZBu/Q0OUPLRbgcir3TuauHwdjtzJVIYNsnYXbWq6x+lyyXytITJnpDmB0/1iWgykJDFXR6D/AzjVNW3/43F4DSbK+/JFuqXXtg7VBxaqt1Fm/Me7/+LxiQ=</ds:X509Certificate>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMLiHS4a6f9OMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjQ2WhcNMzIwODE2MTMxNjQ2WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzwX6vTkOZoSmumLJh9cKTPUPMCZK69k/e3S9A9Am2zmbKn0Wrtmz5fKdmnxCfRUITAa2mopyXu0z6aQbF4D/qpYg1ihD5rBfYAi0diNIa/evlSkLQYXX+NboTQuXoEd3vdTELC8b0ycp+7wh3Lj6ATYvEKpc7Vi5QlV8rdXOs9QpmUKmK4v7XBffUrYxMEcktk1mgJnCX5Nbdd2F4ln7mWRN0zoh1BYvq+prLvMMQPTJLFRhltDq1dTjLlw1haULY/ckr2sTGm5ookxADd94Wp2LKSwlRsIrx9wikJKpjFkqk7LO6L+pxEHNRIf4/dRqFj7IMeV5ZTKqJfiQS9YVqu7JTQuO5nUZb2krSrajZxOgmlgaOki9qFx4sdoPi8Rp6OkBXTQ4piJkzS8qvtwkE7ByoQ6koT3tineYNAbceZmniClya5z6J+oiESOQFg3cYQt8MRZS0EwXpAiHS9z0mfQG7dBczPP1RL/JCZA7ALRlmx/Ygk/tXdahLsHUBtHVb8w1W54Ab2pNgDol/XPpW1Zc4SgQhLcuWJaz7UI+DkV5yAsesT6C0/hhnqdKBTE2jvbKZpfW8o3Hb2E2q1FlgO3t4osfEHHQUqPqGUkAv17DVmuX+HfIVrqGXG8nVbwv9g9FYt2MQjjFzcaaCEJWPreUy7Wm4G8uJHHmx64pclcCAwEAAaNQME4wHQYDVR0OBBYEFDPf15zdA77UoC+hecrvpp879O0AMB8GA1UdIwQYMBaAFDPf15zdA77UoC+hecrvpp879O0AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGoCDhK02cEXdZEhe7Fv0A2wZ1xsrA+GTAMesA4dR9BOreLbHWsE57EWw1TQa7624JyJ3B28KG+pnC7N1LGWEAmUinYfd/9scjKCOHMUURhK5oM/VM8ILeA/B2+u8jEM4jikmSmztv2+CBDFV4LtFxd52BIimDwGRef504IjHfQ/6bQifOsjIWEWonzpLk4ds1UVQlRtiSx5npbeIRunAEQ5oVuLMix2vcyWaWD2qLjrHcy81/V/kbo4ke6LUN5Ijk3LHk0CFMghA8RpPRI0nsv3X/DSb8oHeLGvp6oFgqfiMkEZJK3kCqCMf7Iwda88ltqoLOGmLZ6D9wyX4Hc90PO0UBPuCuWxdhEe6tTO1c45Q/8UvPfoPmYU8VklQEtRwVGeBuXhr1rrPOtsQqKZ+fO8a3vv0mIEJi+IRtGuepZTceinZelc258NmapUTAiuUFVkXmvTPl+wa5hiUkO7zzC9154HpzoZ0vQ7jSczkT/HotT6ky1GJtNcStNKuzlvUG5i7DEZMjyAuaFbx/vy0hRahUefzaZqXeNl31+Vac7rekOHATmgkivaOppqFYEVroG7bwpridNUwrL5/kMYc2IvtmK9tDA7GOcsRFG5T4KO2RBy0t9YPuCoqobGqBgWE9MAqXsomGrinXsEPBlTKJb9PNcmqRueQjubkhx3BPmo</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index 1e00ea86..67ecbb0a 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-01.ladok.umu.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-02-20T12:56:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -25,6 +22,9 @@
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-02-20T12:56:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </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>
@@ -49,7 +49,7 @@
         <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAIp2R64De+1HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTIwNjI5MTE0NzE4WhcNMjIwNjI3MTE0NzE4WjAhMR8wHQYDVQQDExZsYWRvazMtMDEubGFkb2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwt+lqNvFGei/9H+xjcCTR6rgI5yUPlyK2ysVPvEk74oeWxFaCcHuvaiNUGjMwTyPiHSGijnyX9rHPfDTjphasn0M+OXn0j4RIBv6+tfLWr0NVM4CDK11/Dl34OivYe0bIx0hLhT+bXGddtb7AhNrzyiyN7eMtH8xVE4W0aZerCO0u7RR8fH/M8NE/Ge13cnoBgZH/oTVnQw4ZxwHmjGP9ExtigoTyTwfYYGLt/Yx2Vg2dxJJPQ2oIiiaWN0/XxDy/hd3A5M9m5ZuJIzeflmVJLh4b9XsBzlbsK8KKiEKxDOUl9Gd8Lngl77kpFeephnngOMZoGQelFXPPalEndiUQIDAQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDEubGFkb2sudW11LnNlhiVodHRwczovL2xhZG9rMy0wMS5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBTOzWRfEnLCvB5g3eADi4xLMzCoszANBgkqhkiG9w0BAQUFAAOCAQEAST3NMUyn+LDBfrtsdfWxEJqOwHRplwn8eLNJHIdHkGjuLoR4cd1p40TLoMZrA/p6zU65oNrH9RYGiAOxAac35aJFgxDJm1R/x1mt6cAa7OmuJ0Zt2m4TCUsapPbpkKlZFwwH3JLqAyUXo/8dxcMCpGhUSP5Cs4L/HeJhFwQpf1UnQB1s8z4dfctQtzTkj5z3uZeHYir6U+slvK7w0zvLTz/CibUY0lmIhwyt5TvkJBqQ2ybSOwOtHL5ysMthtFoNGIXznFAITAMk8eOu/HIhJOQBcAW1bMonM41YOZsCP/FtAoskCFRWYck704VF6IKzZAxoq0PiN22YFjL7p012eg==</ds:X509Certificate>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMECDl0w1cg/MA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjUwWhcNMzIwODE2MTMxNjUwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwcl+Ekm2rS/oCjnkQXuTcgM0kjj2UFnzutUB2Gnz7vu4MG89XpXhbr7GPVaIi+VK7OcR5WQ73I+exqO9jFJb23qoIfGQBzdShxJdWCICeFuhr7jwsqjwwcX+UP9bR0yvCPoHebgphzi+oUXBNTNF7HoS862q6FhXAvYBvJapSLj8P/qXEMjps7BRZs8eCvTKsVWRd0BnWM1qFjSHfCvBqJvQzgQlgcJpf/Pn6pkqv3xJPokPGiFuQM0gPTrjJHA0GDMBLdTZLfHo8hx9ycNr6r/HQ1oMay+3yX9Chw6dQuxLlXirZTN19mwbmCymRZ84OCVFuAOa5y3CMimZdUEUv8AfS9Gfxs3t/VP7xcdufHGnjIpCd/cadn1wSGCOqmJ66UFtzQtRadMcpgVNHsz9Wy33CCqXBV1ApyQAyav++BUcjkfm+706ZL5tWpprYZGm1M4/0bcQpfXRySMZTRLXyAUHNgN1hefNUTgaZnaUrQJOkForUK+iiOO/R10gYK0r3cEHgLreDEJpN9jPiWRwox6NkEFVbvU6uHcM+qsbRKioZJ3pEcqpEUX2C7QGS6++uvLUT03PUafMoLf0t19rZj5T4cwjCMZ0ZMXgzquSPbXBhCbnnSAcygnVZBusHAJJ5uawUF3BWoDElfIYapPpzCSOf3nwfpcoXJUrbqqLq68CAwEAAaNQME4wHQYDVR0OBBYEFGDQrp6MVLYjkHCvRdKOGQB0NhIjMB8GA1UdIwQYMBaAFGDQrp6MVLYjkHCvRdKOGQB0NhIjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIPp/zbfikl/SMlWMb0NCJjSRGpL6GAzlTCDp0Blum8IqMdp4K5qGjdLwXUEiP0IUhlsEhsaB/WpHajzHpKLv/UWcf/orFAIo4jnpDPe7amZPSxyUmiiYREDNJs4Ia2vv4MwW13CmezHnlP5+5iHDCQ65CFtsti9TL6Q56T71/mzpu9Y7z6vZ3WvHNaO2MoSR3m8L4Evje3z70MsDkrcyQf/C3kjYzsNMScZbsbmNwWqAjRBnUSTQ5t0a7/PAoAJrNBm4myQdPs4G7inOqmnpSuXlc8p5TVi7cszoBhj100nd1W9FQvK3n74XnSnqRGU/nfDQO1HToFMBN2gQdPgjRC2WidM7YXQ4jckH7nbB3pLFvV7wuwo40w2S9mB2Hrh1fzlxUMtrqAYwKW6hoR+aKagSMVFF4rIV9gEB5a3sAmXa9m009sRuUoYVR4ljYS+oJfZAzfy31K2484baubDh/d/94DxkfSuX6fpkfGDCMKkzRQMrlq5lTaSknctFyx2jR166OUO7SQjGwEFwYpIDoP5VtQhQN73RsM8lFNsw8S0vy7xuM+n6AJxAFXKW2FMoA9UkOrH3gpCyvMuRcvQ61er9DIW3jc1lE4WjTyUnmipTdHFNzx30PJqKXOKT/Ot+fxbzKVkzAfKFRkX6JXL3eVD72dvK1jknPrPK1G53mE8</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index d0d59cfd..ccc6fbb0 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-01.ladok.umu.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-28T11:23:28Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -25,6 +22,9 @@
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-28T11:23:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </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>
@@ -49,7 +49,7 @@
         <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAPEBgpwK1hxNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTQxMDA2MDc1MTMxWhcNMjQxMDAzMDc1MTMxWjAhMR8wHQYDVQQDExZsYWRvazMtMDEubGFkb2sudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0FInxZg2fEgXhvHMGxn0wAahTMCX0XTYmg5rs/fhJ2T0RAxuRCUmvf2ETW/F7makbonO75IDHghExLEUGkxcGK4v0uqaPM7/9C799QICJ5cmyrE7tCXOJPO9GAe28Qv88WJm/6DSwngnUryB2r7HlE0fUVrMQopRYLqD33eXBFQ732X9nqt9i/R5OK6O/kOE9nmyaBoQdmjZNLYxnobbDNrHPrcCje8NFVIxXjOzX8vssEpo8f0DtpOj34F15BSvrr8t5F28UdaTx0Hb7c9B3hW8KxAJxs0QHPCI/mgMpBxZBq+9uBLzTxiXvjUjw31EuQI6SJAkyyLBlqHgIUo6EQIDAQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDEubGFkb2sudW11LnNlhjJodHRwczovL2xhZG9rMy0wMS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAdBgNVHQ4EFgQUahPApJv5/xIpL/gbnN8MUfFhhUowDQYJKoZIhvcNAQEFBQADggEBAETmm90R56msmOBioztlxMk6TOQbPYVi4NOnqTOokD/X960brBKntkGpXSnNGd7KtmK5F2ThcZJZ7FuOev53zJv2lzroBv9t0D8S49I3g4JlEM9TgoS8/hi/bFuC3PCCONwj91gF9J6rzYTum9XhUOChqEg5JJskYHNHs9vmVfhmkHLh3RbGweXm3Da7zrphb+mNrM4Y+K+m3IlSj4NBvEIGlu8rf3rl1Iad2HcIevkCgiiCD8V+rumLzXSUTpKeZEqci1h+aWvVDHxYNmDsZbFWOYg+t+Wfcu9uZxHADXvamSFdFAQJqplrSgXsWKNGFgjs4zg7hkT8XjhWJeHVZjI=</ds:X509Certificate>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMECDl0w1cg/MA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjUwWhcNMzIwODE2MTMxNjUwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwcl+Ekm2rS/oCjnkQXuTcgM0kjj2UFnzutUB2Gnz7vu4MG89XpXhbr7GPVaIi+VK7OcR5WQ73I+exqO9jFJb23qoIfGQBzdShxJdWCICeFuhr7jwsqjwwcX+UP9bR0yvCPoHebgphzi+oUXBNTNF7HoS862q6FhXAvYBvJapSLj8P/qXEMjps7BRZs8eCvTKsVWRd0BnWM1qFjSHfCvBqJvQzgQlgcJpf/Pn6pkqv3xJPokPGiFuQM0gPTrjJHA0GDMBLdTZLfHo8hx9ycNr6r/HQ1oMay+3yX9Chw6dQuxLlXirZTN19mwbmCymRZ84OCVFuAOa5y3CMimZdUEUv8AfS9Gfxs3t/VP7xcdufHGnjIpCd/cadn1wSGCOqmJ66UFtzQtRadMcpgVNHsz9Wy33CCqXBV1ApyQAyav++BUcjkfm+706ZL5tWpprYZGm1M4/0bcQpfXRySMZTRLXyAUHNgN1hefNUTgaZnaUrQJOkForUK+iiOO/R10gYK0r3cEHgLreDEJpN9jPiWRwox6NkEFVbvU6uHcM+qsbRKioZJ3pEcqpEUX2C7QGS6++uvLUT03PUafMoLf0t19rZj5T4cwjCMZ0ZMXgzquSPbXBhCbnnSAcygnVZBusHAJJ5uawUF3BWoDElfIYapPpzCSOf3nwfpcoXJUrbqqLq68CAwEAAaNQME4wHQYDVR0OBBYEFGDQrp6MVLYjkHCvRdKOGQB0NhIjMB8GA1UdIwQYMBaAFGDQrp6MVLYjkHCvRdKOGQB0NhIjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIPp/zbfikl/SMlWMb0NCJjSRGpL6GAzlTCDp0Blum8IqMdp4K5qGjdLwXUEiP0IUhlsEhsaB/WpHajzHpKLv/UWcf/orFAIo4jnpDPe7amZPSxyUmiiYREDNJs4Ia2vv4MwW13CmezHnlP5+5iHDCQ65CFtsti9TL6Q56T71/mzpu9Y7z6vZ3WvHNaO2MoSR3m8L4Evje3z70MsDkrcyQf/C3kjYzsNMScZbsbmNwWqAjRBnUSTQ5t0a7/PAoAJrNBm4myQdPs4G7inOqmnpSuXlc8p5TVi7cszoBhj100nd1W9FQvK3n74XnSnqRGU/nfDQO1HToFMBN2gQdPgjRC2WidM7YXQ4jckH7nbB3pLFvV7wuwo40w2S9mB2Hrh1fzlxUMtrqAYwKW6hoR+aKagSMVFF4rIV9gEB5a3sAmXa9m009sRuUoYVR4ljYS+oJfZAzfy31K2484baubDh/d/94DxkfSuX6fpkfGDCMKkzRQMrlq5lTaSknctFyx2jR166OUO7SQjGwEFwYpIDoP5VtQhQN73RsM8lFNsw8S0vy7xuM+n6AJxAFXKW2FMoA9UkOrH3gpCyvMuRcvQ61er9DIW3jc1lE4WjTyUnmipTdHFNzx30PJqKXOKT/Ot+fxbzKVkzAfKFRkX6JXL3eVD72dvK1jknPrPK1G53mE8</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>