Added verify.sunet.se

4 files changed, 185 insertions, 12 deletions

diff --git a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
index 5cbb8374..2a643031 100644
--- a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:remd="http://refeds.org/metadata" entityID="https://ladok3.its.umu.se/shibboleth">
+<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.its.umu.se/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-02-28T09:03:13Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
@@ -20,16 +20,16 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla: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>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3.its.umu.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3.its.umu.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3.its.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3.its.umu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Inloggning ladok3.its.umu.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">ladok3.its.umu.se login</mdui:DisplayName>
@@ -130,7 +130,7 @@ vqX2O1UUS1leSB8AnvrsfuoKlZQQKgsrokXQTEo=
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
diff --git a/swamid-2.0/verify.sunet.se-shibboleth.xml b/swamid-2.0/verify.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..d94a305b
--- /dev/null
+++ b/swamid-2.0/verify.sunet.se-shibboleth.xml
@@ -0,0 +1,172 @@
+<?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://verify.sunet.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-03-16T09:08:39Z">
+      <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"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.sunet.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://verify.sunet.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.sunet.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://verify.sunet.se/Shibboleth.sso/DS/seamless-access" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.sunet.se/Shibboleth.sso/DS/thiss.io"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://verify.sunet.se/Shibboleth.sso/DS/thiss.io" index="3"/>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">SUNET User verification</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SUNET User verification</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SUNET - användare verifiering</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://verify.sunet.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://verify.sunet.se</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">SUNET - användare verifiering</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://verify.sunet.se</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://verify.sunet.se</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>verify.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=verify.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE/zCCAuegAwIBAgIULbPbOMcqWt3IcywnSmI0oiBelR0wDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAxMPdmVyaWZ5LnN1bmV0LnNlMB4XDTIyMDMxNTE1NDAzNFoX
+DTMyMDMxMjE1NDAzNFowGjEYMBYGA1UEAxMPdmVyaWZ5LnN1bmV0LnNlMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA06pxNT6nLpTOet5Irr10nXZiWsDZ
+S78kry0aqEsahlWf0lNc3z6GuAJ3NfngzccxohLOVui9AcZDKM/TcbCjIbWdcJTg
+YoW5opCmASo2vkGKQCk52m6vBuLr2YijZB7S4Ek38yXpqIW35JfD+d+z23yA2wJ1
++TXEVD/abLzgPTFan8wnB7xINl9SFSYqB5/NAN0GZPFvEB86vh00NYYKQjrlUSI1
+KWTTaNUjrmQoqVMHio1qjJnNuqy7vXr6fHY1S5fgOIOrc6Gzzl9hzK135JX/D1IK
+bFWJmmIcIo+jeBtq8kGsCOpxgmjJSp0CukS3R5BfuoHSzhtENpl0AkqUoElnuAiu
+OSi+2l+hbUxiiP4/R5XtIF2cz5Dmfa2i0E9deTF5UGLuVlF5dQYMmoc4goLubWgQ
+CxWPb7VryODMumRFn51nsw5zyon3dJ60umLN1+SSADPkjJuUIA7FH0ze8VHBgE3F
+6QBB0yjkZfuLps1ZPbYRSPxgbCpQ+5xUEls7n2tlgsC/joRF/zH0AI17tjcCXWfg
+BukctE+rvdnIbTEWJXS/ZozCzDAO9CljIzTFycmJOUr67NFQhX9erDoKSrMF7ibe
+6L2xzcyu1lLUYrNkreLz2egc05WrVlTBt/XS9B/oEGzcBNArooAQPtWlnq6fsfWX
+Zb/9DBWu1M/JGfMCAwEAAaM9MDswGgYDVR0RBBMwEYIPdmVyaWZ5LnN1bmV0LnNl
+MB0GA1UdDgQWBBQD4ApjqNfLK78NvIyZEaZ1JFbmczANBgkqhkiG9w0BAQsFAAOC
+AgEAz98RwdRqONUT0S/JTTNI9I6oGS5oWybKP1JGB5SJHlnFTkgi76gdnTZPtoh5
+x2v8rREpfpC9ULtDIKU3X4bVNoCWFLs//akBzo1nv88BrfvcQ48OBToXO3875pkv
+fdl/DLqUCbvgp+4ah4nsdlYuMf7zdYRRuYYRwvwkBWHc2CmjDfdB2Wqd9NpTqkGK
+cHAk//0tzW+hB3NFLb2y19ZLw4fQXABKuU4m3XEAplqj94QTjPIeMkdWAtzcgXGs
+VEmgIeDFlXF5ujLocXDIOJPk9krxOEGx2C7G2XtJXuU3ykmbZkWCst1bPkWBmXcW
+eb2CffwfXlaqCVgs+bwfttsDZkWHc4YNcDcXjbZCt5R2wo03GGXexoynuJHS/j5s
+AWhj85gjiLLLTOt7c0XjLlKRINxWs/gRLNKgLOCP42V92pvUI6fLkKt4cY4ATz/H
+jvJpF/djv6sfYgyuqKaStyq2z1RIg9pKRTvNSUGlwQivrqKifFkkJedUmiHENK/v
+YrBs/sZMhcXcpnvEEwSqU/Z0iO8h1GrUfcYYeBj9g78keEn9Z/qlNORE7f1S5kvB
+mTLq1PBkM+N0pAjIB6WGCgn17EeKa1fqUzfW+4CLNx/erXW32Oja6h0FT+Tnv1XM
+kHAi3ZNocmrS+RBFyEEZTZNxLq7Ywwy0g44NCK6mE0Fxk5M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>verify.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=verify.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE/zCCAuegAwIBAgIUMEyMWB7rs7lwj9oR3LPty9nOXGUwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAxMPdmVyaWZ5LnN1bmV0LnNlMB4XDTIyMDMxNTE1NDAzNFoX
+DTMyMDMxMjE1NDAzNFowGjEYMBYGA1UEAxMPdmVyaWZ5LnN1bmV0LnNlMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA6t4NsE8q9zw1gA5km5+b+d9KF3w+
+KtIfZs7lmeUWKPaoWZv6U0yNLcXLeEtEU51pzFc+I2meIVibWOb9MoA5vWBulWA7
+Ir0MriVuswv5BCfu3Xvq+byUC4Yy2sGwI03bJjJwPZSOVTor9x246p36wTMvdj3z
+hpf7Pg9T/0lPbUGaQ3qSn0yep6x1pZEhZwp2G+wawhB6hHPHSeZ6bNpadaTNTkVp
+h/1qzKzv3vpTYnsEzWvMEVauOjDhq7cLqgwGjLxv7tcok39KcCCASMx6x08Io7St
+RZOh9iBaEUJ35kCnVqitKFOq3FJXbu4UQyuLCszOAgrY9QlkBjFUtZIklyAuPuyH
+Ivv88UqCir4wi+uPA1qYKvqo1qS/yVJNQ9I96qAy4Zu2dv6M6y46YMIIbeByeoAy
+/aAJHiCBsIYvoEpzSTjL7bXynpfH7NVpIhtlrzHXUZSJBmBy9mghEm4LBxMSaKXI
+Xu4fil09fVWCqyuP7a2zMSIPGcQHAf21jg/KrktDEZ7N6UerDLvoyM+hGlBcc/b7
+m4yT021nvkcXr3egpEw6qcvsaahU00zKYL8Ro3c1HdGws08UhBhU9LK5/8GTQ8ZZ
+tosp94NxU0OXhjsDYSnYxiopZxU1POLTm6DNjZhHd8p4+Ae0lYJf5Tj2RHrfySOW
+8OurLXUll/e/lakCAwEAAaM9MDswGgYDVR0RBBMwEYIPdmVyaWZ5LnN1bmV0LnNl
+MB0GA1UdDgQWBBSr2SVJa39q99BF19O7uPUxZ1FLtTANBgkqhkiG9w0BAQsFAAOC
+AgEAbmOpdAURjOSCgpEbcJIu2CHHLlhHVH5vDVFp3Tbw+47DDcmvXpk3Jq1U6hPF
+4XdwnpRnWO5kU6QvJiXNtAsPcek5C6u9vHZNW6tctvgFh0vPsSLvN0e4FYcUCoof
+eKFPGPWuUu01UfKTEmOz3ws0CTnF8pVASYFvDU4e0wYTxr9rpEtP41bJMttsQuPQ
+r9jfI9uQ9+1mz8R85xzud31oBvS0y2bcK9J8t4TDNSDAcJeVtreIdIDgnCEAbKUj
+3iDRZU2t7qrP2ZKn4RX3qKn9blRakFIelQ9b/KrcQGUAuUGFOHmPjcRIhZDyTiTt
+RNXwkJqh954Q5086ZtCRKq1mZ92elFwRO71LtrTaLsICRa2Pe1MxQvUc2FCo2aaM
+4dGOqTokX4GraG5xtr7mhtKbB/vJObMdrADG4cZYBcjo7/nqXjNe9LYW6vLtuWgy
+9RYHg0EHADpcTKN3xjkFG/JCho04pDjz5vugVnnnhYHxpJfv1nQQn3shrZ+n4U54
+KZ63JP/A3wlhJGDHAyU2YbDE8ytQI2SVwlr8YzamiSM1vdOqLGeTDVyTSHTaxjf5
+oL2bH818Ft93Y/h4EFUtHZPG6PQB3dLchU/7yxJGq2+NQEmPEUS6VhHglyla5tUh
+4DuozUGO0vTBt0F7pWMIw/PNSeJF7cf5vZ8PogJ7j0TpA9I=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SUNET User verification</md:ServiceName>
+      <md:ServiceName xml:lang="sv">SUNET - användare verifiering</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <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="en">https://www.sunet.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.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 NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
index d62200ab..d41e5d11 100644
--- a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:remd="http://refeds.org/metadata" entityID="https://www.universityadmissions.se/aws-sp-en">
+<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://www.universityadmissions.se/aws-sp-en">
   <md:Extensions>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -24,16 +24,16 @@ and do *NOT* provide it in real time to your partners.
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-03-14T10:29:19Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.universityadmissions.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.universityadmissions.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.universityadmissions.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.universityadmissions.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Universityadmissions.se</mdui:DisplayName>
         <mdui:Description xml:lang="en">Apply online to Swedish universities and university colleges.</mdui:Description>
@@ -129,7 +129,7 @@ TJGDdw01psMDvgA=
     <md:Company>Universityadmissions.se</md:Company>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>Universityadmissions.se</md:Company>
     <md:GivenName>NyAdrift</md:GivenName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 059baf62..c66b8ea2 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -707,4 +707,5 @@
   <xi:include href="swamid-2.0/solid-proxy.sunet.se-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/mdu-nav.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/vfu.su.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/verify.sunet.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>