1 files changed, 61 insertions, 49 deletions
diff --git a/metadata/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml b/metadata/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml
index 2ae61137..500d7929 100644
--- a/metadata/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml
@@ -25,7 +25,7 @@
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
       </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="https://refeds.org/entity-selection-profile">
+      <samla:Attribute Name="https://refeds.org/entity-selection-profile" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>eyJwcm9maWxlcyI6eyJlZHVnYWluIjp7ImVudGl0aWVzIjpbeyJpbmNsdWRlIjpmYWxzZSwibWF0Y2giOiJyZWdpc3RyYXRpb25BdXRob3JpdHkiLCJzZWxlY3QiOiJodHRwczovL29wZW5hdGhlbnMubmV0In1dLCJzdHJpY3QiOiB0cnVlfX19</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
@@ -57,61 +57,73 @@
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>07bfaeb0ea87</ds:KeyName>
+        <ds:KeyName>metadata.lab.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=07bfaeb0ea87</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVwgtc8SFBRVTlZJGIgx76mbQm4owDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMMDdiZmFlYjBlYTg3MB4XDTIxMTAyMTA5MzUwM1oXDTMx
-MTAxOTA5MzUwM1owFzEVMBMGA1UEAxMMMDdiZmFlYjBlYTg3MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqP+avViGPhj2thVZUaISQbCE6T2rZTunDGUr
-59QtrIOkoyKYN+yIpv27x/xGdM3neDmIM+MwCkuR+bYcl2OgO9CU31Zt2iBTNEL0
-xJXyHGs1j3QJNZkv064uZu/6DhnbUarSGBOcYsyId3BA9jTD6gEaJew5iqwop1Xj
-dUNK5NuoO+vbRQ9eEGToTtnmUTiIkSymdjNgwRsbyfNIMa1it5spV2/CO4kDZy1N
-fqXyABDHLJIir0CzekRCGBDYRfeYLvsHBZ9KC6BuvHdpS/j+r23y03o+2wyIHHcp
-NgXiKb8vwfN3/Tx61zrGAmu1TIXRFBArmjhsPFZBSVxoGpDk1ep00XMhnfBBW5I6
-hJsNgsQBJZWwh0LNzgkoIXNPNmrRAYnXS2q7VZOBAuvbetfBUvnG0Bsw3qC0LJ5y
-WBNQ+Ro1aaghV6BuTWPKflUo/j5gGlnjTDV6VRAG61MjBg2d6v7Kmg2SongBD78H
-CZSZgntY5a6go1MLkrJkTn5jriDRAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDA3YmZh
-ZWIwZWE4NzAdBgNVHQ4EFgQUQX8k62exP59aVyNv91xkmn805vowDQYJKoZIhvcN
-AQELBQADggGBACefiHQ9ljvXSHkPgqV7QURN8hastnbHLgoQmafa1jnyQ1PAVdm6
-GtyT6lHe+YtRl+mtDpjXV6zNlD8w0WybmfGPJ+YpMopNzSUkxGQ7v8aHd4ptfoKk
-ZscfgII3nM+rVWLWtdIgE0YIUTJU2VvCXbYxNZDte7otjdG8gMEjOXFJYu0runZv
-10rB3lFkJf0tEMycJSmtPnJEX0ES+gCmP8kv6Qx4w+xuBrBT5VxthmE14Y/4l80F
-pwRIZ1RSyXCZSAEl4Kb1Lz7mweWM0EsbtbMwkBzGtrbuuZeKg62zeuhrULO5VApF
-+oHbeQGNKiylDlRvAJ574PniPjyXrblslswJN9D4scsHrsHyMzZdXSjkTjOQsrk5
-Oci1lgWUvMVEcDRNEkVzxGHW7N7QkOkEd6ggHAdcAerExVqU7GSSFJy2N2V10CtQ
-KxzjFS087+e1KGbtHGTycSxW5WPse8m4YCPlv/PIEx7ongx1ydgwf+QJp61SKcUX
-NAu5oleTjvQwQw==</ds:X509Certificate>
+          <ds:X509SubjectName>CN=metadata.lab.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFDCCAvygAwIBAgIUVYf53WMuAj58/hsBc2mg0Lv+6qQwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAxMWbWV0YWRhdGEubGFiLnN3YW1pZC5zZTAeFw0yNTAyMjUx
+MzQzMDJaFw0zNTAyMjMxMzQzMDJaMCExHzAdBgNVBAMTFm1ldGFkYXRhLmxhYi5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCd5974vOhg
+eVfRoYXuj/3uPcDguJphGvefrm4G/jtBz6YNN0y1saTk2X2hFvqTXuiz1kGs+DZa
+BSaNJXG3kEkxUf57WRTttGM1VPQauvf8eVK4/6OucvFpfMcUCcQNCRLpb74GaKPj
+uIuVr9Vfb19SH7m0ghBz2Jr6wOeyD6uLKaVTavnjX49fb6f3PinLoLFJZFt692gi
+di3AvJgkdaAqJ4Ay7koRqIZU0uWvVr7IqGXtgw6xdbPHXHUV8TEtRbumqfcjCQoX
+4TY7/NwQe//pNuKVp2ksJ+CJNl95aWPpRWP6w6MCY79KYzLFuvrAVx9rYn7SXvJk
+NGjwXL0urvB9gP6nlNpQsrRRg/3NBmMTvCHZ1HsSAY+sDq3Q7cZWt6FOACMNoYqI
+9bVjhpssLfj+lW5ksbhIfLd5FIr+s3wxahslCJYOGwGGMu31Iz507b7Iqnl2jrLo
+5ww5pKGX2RjfJAC6YuoKdlOJqItIHTKf0lQWq19cwSmdPXoQ3113y38jnPdre8yl
+img0+awZB/JuhdU6mKt03SdKRI68U0UAKElgmgcepX23OukABC8RuwwaDrGulfZQ
+H20EYUZ0VFSkHd2biUHPmcoYTNRg5DUmW/P8WGklml5ONCLp2W/Ra6vtbIrz+TvT
+y8Fsi9P7divksz//soyTtFeyDd7eC2krKQIDAQABo0QwQjAhBgNVHREEGjAYghZt
+ZXRhZGF0YS5sYWIuc3dhbWlkLnNlMB0GA1UdDgQWBBTvyN+xy0+J4WrmHrVSYNL1
+hO6VxzANBgkqhkiG9w0BAQsFAAOCAgEAC1uiTC21G7GKS8vTd/jLcyeHr46+Tgcw
+/p2LZAlApQUzBoYhftOpzlpNECxiuQT7y80tnHT7tXX8iVi04LsGDfHWGZ58vnQO
+kjf3Udr5m9qMPcQ+y1Zzj36RjKwhBpDUQBVv6huS9cbkGzZ0SnIGyM1uJVooREOb
+EpXESkg/F/HAqnX3SNVoQM6a2K4cvscA9qVVU3CP7g0woGv09O2IuOYIVwsT1I2z
+75YAtYDLoUDj9CVyh4wstuWYxurR3Bo+YCioN7iob42a2xDDBLABe95fuDmghd8v
+e3aKmXVXhrx83M0NFurourLA6WGn88YUoLUl35sHNnH76RdRhOZ+XvDV1h6yjuGz
+9V2KV8lRE76ERVAQ5wpjoBQJOZC7w1VMWi/nIzrkj6TZcTJ4rxXrn6agwF9WQ8aN
+1LLBuGt+Cwdyemc786vtyz6h/hwGykBx7HSHPqCISGVK7gnShkeO73ORIxBQl4T3
+J1HG0HTgRXeV7/WCLRZoa2fI0uS/DM0fBdRrXt75gIY6Tn+W56WzlqV+F6Pg3sKl
+awSR4LqYMScrAgPdWFtp2SS4oCLO5BEJhUOXl0Q3+9bzwqWzeOLpNmDu4g54wUb5
+ln4aMXfYx89GZcNk11VZREHmLTxhi3sS6tCwfoOpbB4In8qD1DWwnFsiGOJW04k5
+s+mli1vB2Vk=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>07bfaeb0ea87</ds:KeyName>
+        <ds:KeyName>metadata.lab.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=07bfaeb0ea87</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUdnvLzleBiCh6hkldNkCxCdWRHl0wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMMDdiZmFlYjBlYTg3MB4XDTIxMTAyMTA5MzUwM1oXDTMx
-MTAxOTA5MzUwM1owFzEVMBMGA1UEAxMMMDdiZmFlYjBlYTg3MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqMRR5xOFqKc1Sq3Lw3hc1sTl885EMg0moJ5i
-HdpWiAp9wV77KFoH9bjuQullJp96hNe3BFC9oN98ZZUdClF5NMdvIveQsgNAl+jB
-za1AjWbih0BF3WR3OMTOpfU/+rm34O+J7b8h6jKkPtm+OiRH/jWe7L7f/V18ezxT
-6PLd0LFFrr2LRQv0UaNxUU61ltKH5GNNTkRGIktGN5/UtunG6YC5V9tyWW0NCN+O
-qEgjhAtazilDROnP6P0XPdvOxaKitx5qlBB2+7QVHbDNSOeCw6SEEfnqFytR4pse
-5RsWxfbjipRsHecChrlH2GynbM0Z8JOxcPo7Y6DqESrboKbQUPGfXq8FqtMh7eWz
-0ZjosNfA4dmexF8vKzIz3A2a0oFVgOQj4QjsuucJqj7ThbfciDYMpCLKYxM4JPG2
-gk4udx2tsjmpkALcFWtIyC/mDtueKwCXuExydlVsk2g8xm1tLplM3JmYXvtPGy55
-F+wrLMnHtrK63dbpJOKBsktrL+2FAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDA3YmZh
-ZWIwZWE4NzAdBgNVHQ4EFgQUfAQbbAXqqnajOyt6V8G+jYMnZpQwDQYJKoZIhvcN
-AQELBQADggGBAE7cGccvmgKclxvwRDl8GhBEV/JXjEFuNWqetUWL1uqo6LjxETVm
-p03C4MqXpnQjaS1ZKUzIE2Z92r7zFuHIzd2dXiIxluhECthDya6TwgVCRqrGfRs8
-a1tGCzoM7iZh7REvMh4i7VNB7Lyj/yNY3qowt5D2sdzCUfS5NBPVgaWkPYYZqcfm
-LMARlhy7zW1KNNuAyk45TUFi7WtGt9juu41suQRRrMCKIiIpmbK8E0L2FK/QxfXv
-oLFmecKG72DXKHKiHUbVH0sLVh8qen+3PcBSPvtrBCUyD7vS34VV8yajJo5A3Ogz
-3ZblFfrla2DZKC/HUCDOydqiXh2I8Ltt8HN7exgbrLqbsF+xUqolQv/pCaAIZq1U
-vAsVSDYSdq0zuDb+nrAtPLYAA51OwFmpO6rlMRwbVoxNfi0oegWWgxTOnK2VctBd
-2AQGKekuU96Nc8bJOxHFD7mO1iTmvORamB/Ibxle1ieOqz7+JJefAZ5l3/oOWHig
-q6dUsY0AZixwYw==</ds:X509Certificate>
+          <ds:X509SubjectName>CN=metadata.lab.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFDCCAvygAwIBAgIUL1D5kZhcZB94llPjPjhFrrhRn7IwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAxMWbWV0YWRhdGEubGFiLnN3YW1pZC5zZTAeFw0yNTAyMjUx
+MzQzMDNaFw0zNTAyMjMxMzQzMDNaMCExHzAdBgNVBAMTFm1ldGFkYXRhLmxhYi5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtCUEhXYcI
+/QdOC2V+saiPLd1MKtZthozky2yLlDQEniX3/iT7PT7hMpnVzubappASpxFYNIwc
+tJvjbMn3ZgsZ5uvnCUQV6F2KvFzMdPK/CbHipgZhoIfXoPPlrUfmzzhyTitwNeV2
+llrpGP2jHmbBQXHYvlyoM+r8fh1e7/xDcweiSId+UAHBaSTJ9nmZKP4E25BfBgp1
+VRDAUUig1K3t9OrdRzz1NNscUUFVyJImagQu1546NmSeX9ROZeE1bri+7rDskA9R
+2SYnHo0qEsf1tpKOGr5kfvrqMfF3QWuJpLuw3Q3gr+EgIVlQ8vk913pFYPx/RWeb
+rxWh37UzCIaSo4GtHjX0pdjvA0EIlxia3jcHjgW4echF0YDQiGZz2vmWp2ieXL6r
+0Xi5iH9nEGNDemAjLgDYCSCfHHn9DJzdNhSGmvPPQ0ZU/XmITHQCzR/cVLCcqKtb
+8VaarETJK54/xovHq8Rlzarm3SFz/apz3C7Pmpg8eS957goSKEjuJyTlxcXAKngW
+bkuS+OzDzo7LdR2UrDdKHH5HRCwFRY+lt1sGqRlJCJdjNjfB2nP247/EotizVNjf
+9jHhgxSaYVRBcydjYxnfnrSHvnv35rtHO9pkaQRhlzm3NF5+cygDka/kpzojlxqV
+McvKBYLEmVNLJ2hKZ3jBxePQhKSTb3McQwIDAQABo0QwQjAhBgNVHREEGjAYghZt
+ZXRhZGF0YS5sYWIuc3dhbWlkLnNlMB0GA1UdDgQWBBQLtdjEKNNNoQe5NEfvbQNQ
+XlGX5jANBgkqhkiG9w0BAQsFAAOCAgEAYPwhH6GcY+uWTXtYyDlzSlJu56dVI7wh
+czWJqeat5xTAnLcn2bV2omrlmfc8pKJAhxkHUV++237FP2nZPkCyxpS8+qOLs1hw
+FKUkmihm8PSa7ywGjP7gMwgyfYQyStenaoN9oVR5q9wdVBF3WAvOcgGSBvU7/alS
+0mj8cz0YBDi68oiQJ9KYCWSQtSSPNiITE/y2GKG6keiNEA1hOMRsisQk4d39LOJb
+nndiSER1dP79NXzxoo6yBXwjcR/D1rXBW75Fe/8LRqTUliF4StXxt0Y9EakMZZSU
+fMcTUcE1l4ReWgnS6H5EddnbXHxkVBAO11AXx6W3jXzbLI2ljw7HS3R0L78aWp4l
+9cMzfL+bNk7V2bTauQxlphtJMXTHSXK86s3NahYcJApCqIuJ/mMmYMZ/fF+1WmGo
+lU+00QfpajxbocA0ARRxFcGkYKkXJPdJLDEfeG5Zqe8/aGHyz6HzSfiaTi07klnV
+D504srl1eRMgL4NNuoBsy0vheiv+N1rfdcIQFhUXWA4REhInzWhPrsbKVbWOygKa
+EbO/bZvlvtAdSY+NWOM7XWH9wCaGWBr+RUM+W5RMTMry0eHBcpKxZvMWWOWrq5ft
+YT7WeBz9663YnyrS2A9bZ+siqcbsShqr/mVCULOsXvV21crrEAGm+Q6SlQEEOZqn
+BBFXfN5BeIQ=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>