From bd32145991820a8367f9e5e44b8e275e27a1a914 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 23 Sep 2011 13:05:36 +0200
Subject: 
 https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml
 into swamid-interfederations-2.0

---
 swamid-interfederations-2.0/idp.it.helsinki.fi.xml | 95 +++++++++++++++++++---
 1 file changed, 84 insertions(+), 11 deletions(-)

(limited to 'swamid-interfederations-2.0/idp.it.helsinki.fi.xml')

diff --git a/swamid-interfederations-2.0/idp.it.helsinki.fi.xml b/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
index a0e9ff0c..424beb9b 100644
--- a/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
+++ b/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
@@ -1,31 +1,94 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.it.helsinki.fi/shibboleth">
-  <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: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.it.helsinki.fi/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
       <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>
-      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEDTCCAvWgAwIBAgIRAMw9CoSolzrdt3r+Lqg7wj4wDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMDA1MTgxMjIxNDVaFw0xMTA1MTgxMjIxNDVaMGMxCzAJBgNVBAYTAkZJMR8wHQYDVQQKDBZVbml2ZXJzaXR5IG9mIEhlbHNpbmtpMRYwFAYDVQQLDA1JVCBEZXBhcnRtZW50MRswGQYDVQQDDBJpZHAuaXQuaGVsc2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1i8Gzl55VCmiRBnCsUW+zNgPDErEpdCutjczeF3FR0Z6m6J5rxoBl9r1nXD3MqXr7/omlmlnnqxdBvwJVp5nTcOibQh5jW+y6BZ4KZX4ABTwuMLgp3MlISqnU0ySjP4n+ftFeqAiWy8izdTR9tEpJIDvo6xaG1JwbxqpJR7TN2W31ztn0Xe5MovTJstutQqBbZJk1vzQyVpGBmI9F8MT3Cupmsz0c0U9MZ3RI12FIJEg2cj4USiFO2KbLkUEOj+ON6qjHlrCzh0J+91LRCmym8dC/98RyimTKxulkNBanwCjigaSpsyRhkKJgAUMZk+HSPnL8teYFs1Gqi5cJoTLXAgMBAAGjgeUwgeIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIwcgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIwQ2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFyeTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFBLWn9JmfA2kMpSWGGhWog/e/2TFMA0GCSqGSIb3DQEBBQUAA4IBAQAvFUVo9+3VMHC5ioJSjlEhkNf3J+sqzOceHjdXnTYbOd1ySrXb+p8LX4JnsBOctnJsHahkQHkfMxLlkYpwjBR4/sJRScE/tYi6KVoc8DqacGHSfbxTR4t9jy9Y6+43MEuFFFOHfG4WBUb+1aNFxMfn0oxdPU9uXeyE0mKj2wW+Ykh6OifiTMy1w0rG5OqyH02H21ePehuQmYenmrURChbP2f06szu2Iiwa0+9pRz4AwP8hDXHpQIAUKSIr5JRB3rYutgoVLDHUhTIW4b0ahrP9ofxGK2D2+lRbTKuT6C7DbSisJsG/n6o4cNbBTkWQMeJbKtSzXEY6xD4gIfGmGp1s</ds:X509Certificate>
+          <ds:X509Certificate>MIIE4DCCA8igAwIBAgIQZn39PmRSCZ62SwsmIa4aojANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMDQyNzAwMDAwMFoXDTEzMDQyNjIzNTk1OVowgbgxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
+BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
+HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
+bnRlcjEbMBkGA1UEAxMSaWRwLml0LmhlbHNpbmtpLmZpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAyK5KTNz4ELhqZ3LR9cMf/OM/MIdw+oNblBoizLVV
+03ikG2b0XFnYu8aDJYBo993D8c+hhNE/63owt3BaPuRufU1qmJIOW+7UQAjFj/AC
+01BvW8fmbR4SFZZuyCFzbs0oPZ5spYhjMIqMm0xYEWEQ1wdrf27KCJrI4+YZgKR4
+qhTnm+wg7Gp++EBchCKIssZSP0HFu9pWyaiaWpWj+rO3hSIr0lQPIdkXeaG1EEe2
+qLU9rB5jdA4mAufE98j3sbbbE74HrYhPLEnO8qOPs+Dd8gKYBa07/YBzjAKsSyTn
+Eo/PcOg8lqFXLomZ/ZtedKF+vmvaMWOxBA5SXJjTXX3GtwIDAQABo4IBZTCCAWEw
+HwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBkdk1+u
+unMB8VAFivm0U4Is4evWMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQB
+sjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
+aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
+BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlk
+cC5pdC5oZWxzaW5raS5maTANBgkqhkiG9w0BAQUFAAOCAQEAhKsDvGEQEWrPjPKz
+CNuiAlgRd3TQcbxqY0oDPAeUdBhUw/idEQOek5Uz07Y8ZUsyH05s17wuCXyn19a7
+KPgUsgNlvy5o5+DGv4PpjzUvjHaokawQFsycLW0AG2UC78UPLGAtk0hh4wRtrwLY
+EDcBP3LwtCoYqfrVqy537g0W68NlNv2MSjtFDq2rOvxO+B67TBmkTHx/v848epUA
+W6BwdDSP8schHGwDP1DLvFoFlZ/T7vaIg/460ioTZ6XBKYYVXiCCX2qjrZy6ayMd
+amwGEOJi/gst4Ol+x3mwFw6dZATmLJ/WTYEqS1O2RzzxHOukzhl4B9W23LpssqSk
+mdOXEA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.helsinki.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEDTCCAvWgAwIBAgIRAMw9CoSolzrdt3r+Lqg7wj4wDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMDA1MTgxMjIxNDVaFw0xMTA1MTgxMjIxNDVaMGMxCzAJBgNVBAYTAkZJMR8wHQYDVQQKDBZVbml2ZXJzaXR5IG9mIEhlbHNpbmtpMRYwFAYDVQQLDA1JVCBEZXBhcnRtZW50MRswGQYDVQQDDBJpZHAuaXQuaGVsc2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1i8Gzl55VCmiRBnCsUW+zNgPDErEpdCutjczeF3FR0Z6m6J5rxoBl9r1nXD3MqXr7/omlmlnnqxdBvwJVp5nTcOibQh5jW+y6BZ4KZX4ABTwuMLgp3MlISqnU0ySjP4n+ftFeqAiWy8izdTR9tEpJIDvo6xaG1JwbxqpJR7TN2W31ztn0Xe5MovTJstutQqBbZJk1vzQyVpGBmI9F8MT3Cupmsz0c0U9MZ3RI12FIJEg2cj4USiFO2KbLkUEOj+ON6qjHlrCzh0J+91LRCmym8dC/98RyimTKxulkNBanwCjigaSpsyRhkKJgAUMZk+HSPnL8teYFs1Gqi5cJoTLXAgMBAAGjgeUwgeIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIwcgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIwQ2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFyeTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFBLWn9JmfA2kMpSWGGhWog/e/2TFMA0GCSqGSIb3DQEBBQUAA4IBAQAvFUVo9+3VMHC5ioJSjlEhkNf3J+sqzOceHjdXnTYbOd1ySrXb+p8LX4JnsBOctnJsHahkQHkfMxLlkYpwjBR4/sJRScE/tYi6KVoc8DqacGHSfbxTR4t9jy9Y6+43MEuFFFOHfG4WBUb+1aNFxMfn0oxdPU9uXeyE0mKj2wW+Ykh6OifiTMy1w0rG5OqyH02H21ePehuQmYenmrURChbP2f06szu2Iiwa0+9pRz4AwP8hDXHpQIAUKSIr5JRB3rYutgoVLDHUhTIW4b0ahrP9ofxGK2D2+lRbTKuT6C7DbSisJsG/n6o4cNbBTkWQMeJbKtSzXEY6xD4gIfGmGp1s</ds:X509Certificate>
+          <ds:X509Certificate>MIIE4DCCA8igAwIBAgIQZn39PmRSCZ62SwsmIa4aojANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMDQyNzAwMDAwMFoXDTEzMDQyNjIzNTk1OVowgbgxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
+BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
+HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
+bnRlcjEbMBkGA1UEAxMSaWRwLml0LmhlbHNpbmtpLmZpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAyK5KTNz4ELhqZ3LR9cMf/OM/MIdw+oNblBoizLVV
+03ikG2b0XFnYu8aDJYBo993D8c+hhNE/63owt3BaPuRufU1qmJIOW+7UQAjFj/AC
+01BvW8fmbR4SFZZuyCFzbs0oPZ5spYhjMIqMm0xYEWEQ1wdrf27KCJrI4+YZgKR4
+qhTnm+wg7Gp++EBchCKIssZSP0HFu9pWyaiaWpWj+rO3hSIr0lQPIdkXeaG1EEe2
+qLU9rB5jdA4mAufE98j3sbbbE74HrYhPLEnO8qOPs+Dd8gKYBa07/YBzjAKsSyTn
+Eo/PcOg8lqFXLomZ/ZtedKF+vmvaMWOxBA5SXJjTXX3GtwIDAQABo4IBZTCCAWEw
+HwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBkdk1+u
+unMB8VAFivm0U4Is4evWMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQB
+sjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
+aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
+BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlk
+cC5pdC5oZWxzaW5raS5maTANBgkqhkiG9w0BAQUFAAOCAQEAhKsDvGEQEWrPjPKz
+CNuiAlgRd3TQcbxqY0oDPAeUdBhUw/idEQOek5Uz07Y8ZUsyH05s17wuCXyn19a7
+KPgUsgNlvy5o5+DGv4PpjzUvjHaokawQFsycLW0AG2UC78UPLGAtk0hh4wRtrwLY
+EDcBP3LwtCoYqfrVqy537g0W68NlNv2MSjtFDq2rOvxO+B67TBmkTHx/v848epUA
+W6BwdDSP8schHGwDP1DLvFoFlZ/T7vaIg/460ioTZ6XBKYYVXiCCX2qjrZy6ayMd
+amwGEOJi/gst4Ol+x3mwFw6dZATmLJ/WTYEqS1O2RzzxHOukzhl4B9W23LpssqSk
+mdOXEA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.helsinki.fi/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.helsinki.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.helsinki.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
@@ -37,4 +100,14 @@
     <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olli</md:GivenName>
+    <md:SurName>Saikko</md:SurName>
+    <md:EmailAddress>haka-hy@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aarno</md:GivenName>
+    <md:SurName>Sandvik</md:SurName>
+    <md:EmailAddress>haka-hy@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3