Merge branch 'master' of git.swamid.se:swamid-metadata

5 files changed, 154 insertions, 9 deletions

diff --git a/swamid-2.0/apps.convertus.se-ki-shibboleth.xml b/swamid-2.0/apps.convertus.se-ki-shibboleth.xml
index c5edab18..07430d78 100644
--- a/swamid-2.0/apps.convertus.se-ki-shibboleth.xml
+++ b/swamid-2.0/apps.convertus.se-ki-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-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: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://apps.convertus.se/ki/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
@@ -24,10 +20,24 @@ and do *NOT* provide it in real time to your partners.
     <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" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <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://apps.convertus.se/ki/Shibboleth.sso/Login"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Convertus Kursplaneöversättare</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Convertus Syllabus Translator</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Convertus Kursplaneöversättare</mdui:Description>
+        <mdui:Description xml:lang="en">Convertus Syllabus Translator</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.convertus.se/sv/tjanster</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.convertus.se/en/services</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://convertus.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
@@ -72,4 +82,12 @@ zHEpRj4+aQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.convertus.se/ki/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.convertus.se/ki/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sebastian Schleussner</md:SurName>
+    <md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml b/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml
index 68ff8e37..db098606 100644
--- a/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml
+++ b/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-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: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://appstest.convertus.se/ki/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
@@ -24,10 +20,24 @@ and do *NOT* provide it in real time to your partners.
     <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" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <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://appstest.convertus.se/ki/Shibboleth.sso/Login"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Convertus Kursplaneöversättare</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Convertus Syllabus Translator</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Convertus Kursplaneöversättare</mdui:Description>
+        <mdui:Description xml:lang="en">Convertus Syllabus Translator</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.convertus.se/sv/tjanster</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.convertus.se/en/services</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://convertus.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
@@ -72,4 +82,12 @@ osdSjbJvuw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sebastian Schleussner</md:SurName>
+    <md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml b/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
index 7f4e5036..f970c853 100644
--- a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
+++ b/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
@@ -27,7 +27,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <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>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Halon Kontrollpanel</mdui:DisplayName>
@@ -38,6 +38,46 @@
       <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://halon-eu.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://halon-eu.sunet.se/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>halon-eu.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=halon-eu.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEBTCCAm2gAwIBAgIULkKPd/CXKCPsRQBFu/4Lv42cRKUwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAxMRaGFsb24tZXUuc3VuZXQuc2UwHhcNMTkwOTI2MTEyNDI3
+WhcNMjkwOTIzMTEyNDI3WjAcMRowGAYDVQQDExFoYWxvbi1ldS5zdW5ldC5zZTCC
+AaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAL7ihxti94w+iQsUryb1kldP
+5j69KNPAMa6+YcVmrpezHFbyeN+rMP0r0359sfnVJ2dr3o1HxpqHhOBnpoJaNH9P
+TUubh14K6slMPxbQ2/TigAhnn8lgOUsqYi0Ke/Um1okLJHZprZRKhYh6wEFpwxrR
+vTpmdDK1ISbpRGgYvRE6zl8tISymi9wpbcuPzTy3aY5kkJwwasYQOEwvUfAfhi9w
+tvKpRgXXQddsrNI8IUYpW9WwpTVWFaeMhF2y9imY8+gQuzsbMSu/9R1v0sQiaQrK
+jd6gXM9g3SriLkpUDO7O+ysWCFC4Z1SW3+PzIVMmWKK7sKRiEZ4gDD5REzACJnce
+9dqf0nYsE6BDzjDdv5vGJ5Se54n3NztCzIVog11MkJpsFpNXBo9k5KUpUY9bqvZ9
+PY6j3pQJFxVouLCJRWABOtFM0FXeuFn9h+dmAFDG+d55N3JCYgjcDpUh3lOxi6Gd
+bbx40dsrdhRiw/TWRVyo4VQgWaMD/VQlp0VRw6LoXQIDAQABoz8wPTAcBgNVHREE
+FTATghFoYWxvbi1ldS5zdW5ldC5zZTAdBgNVHQ4EFgQUgxzkqLU18BtEch/Rnx1n
+GWG9V4QwDQYJKoZIhvcNAQELBQADggGBAEk0s9YU/T8g/x7I6GcsyL6Rc3wTGJ1L
++E25DBOElDKTr8KVhZL93v8o2sFbwgy5x910xPGoHRmxuFxmtllr1nP4ceQBol+O
+TlPCIeqIkVbCawb3jmweiZOvuUztwFSJRXH/9f5qCM5pfer6l+GTSNZynZHXnX0C
+LRWKnSMWdh8nkdDuIv9dz3tiwfUmTAyULYfCOFE2jcJVposYNPr531wocHwGeWd+
+f0TqdCa5wlxhE+dnR243VR3fXLIDMwtDFC9T+wG6zFKNqMaPvaw0NheEKMr/P3xg
+9GUItvR+Q7pWCpR2+ES9CkhnWTxPA06fd4pPdJc8b3l5Gv1kTEEj6u5XhZ3cP7lv
+DHWP8cgwx2vtq4MKzdUdn0x/Hb9fT/MWszjyqJyuvxK0hmLxegcWXxLSypTarV7l
+xSxsRARlPrKztIbnHB4erd0hhaHcs/Mu1MkJq5TYJvTkCpky+QVf7dZcFhEMnEoi
+uQHAppDUMcAVcciXyqOjeW25eKnOv6Dnkg==
+</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://halon-eu.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halon-eu.sunet.se/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halon-eu.sunet.se/Shibboleth.sso/SLO/Redirect"/>
@@ -46,6 +86,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halon-eu.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
diff --git a/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
new file mode 100644
index 00000000..e1913312
--- /dev/null
+++ b/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -0,0 +1,66 @@
+<?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://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/metadata.php/sp1">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Skolverket Assessment Master</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
+        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
+        <mdui:Logo width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.am.uat.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Skolverket Assessment Master</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SSO Proxy service for skolverket assessment master</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>SoNET Systems</md:Company>
+    <md:GivenName>Software</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
+    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f4c6f383..ba3e70ff 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -594,6 +594,7 @@
   <xi:include href="swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fidus-test.skolverket.se-sp.xml"/>
   <xi:include href="swamid-2.0/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml"/>
+  <xi:include href="swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml"/>