1 files changed, 51 insertions, 16 deletions
diff --git a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
index b1562f6a..992ebf7b 100644
--- a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aalto.fi/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.aalto.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aalto.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">aalto.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Aalto University</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Aalto-universitetet</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
         <mdui:Description xml:lang="en">Aalto University students, faculty and employees.</mdui:Description>
+        <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -51,6 +45,47 @@ ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGjDCCBXSgAwIBAgIQQBGYQlL1yp2E+vYQYv24ajANBgkqhkiG9w0BAQsFADBE
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMR4wHAYDVQQDExV0
+aGF3dGUgRVYgU1NMIENBIC0gRzMwHhcNMTUwNDAxMDAwMDAwWhcNMTcwMzMxMjM1
+OTU5WjCByDETMBEGCysGAQQBgjc8AgEDEwJGSTEdMBsGA1UEDxMUUHJpdmF0ZSBP
+cmdhbml6YXRpb24xJDAiBgNVBAoMG0FhbHRvIFVuaXZlcnNpdHkgRm91bmRhdGlv
+bjESMBAGA1UEBRMJMjIyODM1Ny00MQswCQYDVQQGEwJGSTEOMAwGA1UECAwFRXNw
+b28xDjAMBgNVBAcMBUVzcG9vMRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEVMBMGA1UE
+AwwMaWRwLmFhbHRvLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+3CGuAp1bJJx+nyb6vKbP1vO8kaGk7+hz9i5R/X3gmmgwOrDhzV0xLqk/9m5Qe6xC
+36D4AMMvnfuHNOaRBLocFhKuHOyHWNjx6j/pd2/CP8V/jJpPUPl82qxpEAnuw+H7
+te/YjuvOUVSmpKIi77spkpCV1I6/T7LNFjTGlANVXXu1L3jcDfiRxzebOPD9DrK0
+EuaaL+P5psr4osRYrrdUvG3/xwb60wvwOectvoqivUu9O/ripAaf8RsxSTzsgPCH
+OSpnCFP1MMelxsqGV3RcCDefmTrHnrYGL0tmq2r6ef9JUN5tsvFdNhtz8e+LlcMN
+UY7UOKRB5syT1knOfnXNUQIDAQABo4IC8zCCAu8wFwYDVR0RBBAwDoIMaWRwLmFh
+bHRvLmZpMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQkMCIwIKAe
+oByGGmh0dHA6Ly90aS5zeW1jYi5jb20vdGkuY3JsMHMGA1UdIARsMGowaAYLYIZI
+AYb4RQEHMAEwWTAmBggrBgEFBQcCARYaaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9j
+cHMwLwYIKwYBBQUHAgIwIwwhaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0
+b3J5MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBTw
+cFHa0yqRT1J314Z3dA/OcRpsIjBXBggrBgEFBQcBAQRLMEkwHwYIKwYBBQUHMAGG
+E2h0dHA6Ly90aS5zeW1jZC5jb20wJgYIKwYBBQUHMAKGGmh0dHA6Ly90aS5zeW1j
+Yi5jb20vdGkuY3J0MIIBfAYKKwYBBAHWeQIEAgSCAWwEggFoAWYAdQCkuQmQtBhY
+FIe7E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAUx0jHICAAAEAwBGMEQCIEWc+I70
+mCckrqkWBkKgNUnXIKzSHwehkzTf2Ei+TjKiAiBG229TlnJfxeVCv3wTlYdQBIWD
+4ai3kgtwa44yAuCvlgB1AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDd
+AAABTHSMcuQAAAQDAEYwRAIgXai9EFYbpbvu6tLF2U+j2NXWvYXNY3QfYzfRaZBw
+ivUCIAjuh9BNjpHhbwy2sGVNDW03h+BZT7vl6Y3aAFq1OyWyAHYAaPaY+B9kgr46
+jO65KB1M/HFRXWeT1ETRCmesu09P+8QAAAFMdIxyMQAABAMARzBFAiBd1pYbyvxQ
+a8wJoV0UJ1oMMNelMzft3Cs1bOcH9WDSogIhAJUaVVoWyEYYaP1tzXQG6n8x2dVi
+f13tQdj8DT/JNK59MA0GCSqGSIb3DQEBCwUAA4IBAQA8b/jud9ETQ1M29j/8YzTp
+iKt9i8vc/SfL7aJ7Ph8l8hZCijz54H0z6yzcNQf3u0MhDcJwQXos9359dIoYLnYk
+7J/hqoSuTFcvB3qcxzsmSsH7wO2ZnQKqFqBbqKmHblmgjNQ2Ghci1TpX7JqmPaWU
+JOxkAOiCKGJuSiaQd4JBZx1XOJc8X1sJ1O0ULJtCTBfjvp+mbDKyT0D/V10My2+S
+0WSH3K4frOs8CoeVBiW7y6y3jSQv2f7ZxOBqypOflXh5/44e+O3CGwtbJ0U1+6q3
+6CemocV2CDzExQbpt7NmW8ijME6yBnXJclsnDSVIbyAQLWoIu1IUqiPdHrPHTD3m</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>