http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 23 insertions, 18 deletions

diff --git a/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
index 4ca25962..827394a2 100644
--- a/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
@@ -44,24 +44,23 @@ Filesender, the Internet2 Member Portal, and wikis. </mdui:Description>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIBADANBgkqhkiG9w0BAQQFADAhMR8wHQYDVQQDExZzZXJ2
-aWNlcy5pbnRlcm5ldDIuZWR1MB4XDTEwMDYyOTEzMTY1M1oXDTE1MDYyODEzMTY1
-M1owITEfMB0GA1UEAxMWc2VydmljZXMuaW50ZXJuZXQyLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAO0gg/lSr02wwP6ZOljGB/C8qdtPwvssnJE3
-UGmbnbaMbK3xllq7fmeXaaAPcrUFkpdn8T9mmJYMF3k7/oRf2mlE7MDWPyJTSRq9
-SXNL7NRrfu0KFhZ7TPBCDtbxlrC2NpnveXx6p//k0FBrSVQaWc0QSsnp7AoNPBBp
-zzYIHotJATGAv25tg+3kX/M+mbSzziQ2bq/qcLv7O/yZCYOERDAtC5x3YG2jIReH
-+3Lt/KR51sXU/XMI9Dhez4q5jS6Fjr6IChZMsQc45RxNkVlpcbX9V/udkAIVvZ7c
-So16wcBO4po5nrm4mxS7Dd5NVqJfU0QUUCKKgVR+rfAb2sKwPDkCAwEAAaN6MHgw
-HQYDVR0OBBYEFOEPkUTO3wPRGLr62F2meNkDWQTTMEkGA1UdIwRCMECAFOEPkUTO
-3wPRGLr62F2meNkDWQTToSWkIzAhMR8wHQYDVQQDExZzZXJ2aWNlcy5pbnRlcm5l
-dDIuZWR1ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAEU232XW
-60YHEMRair7ZqBN1RzyeSgSN4TcSPe2Swlys9ag+zDk3wWJpta9jSKmGdGxSddjt
-34m5QMdRsMTpo2kaZ8kLfhTzs8bA7g5SZ6vtoVsshGl610P6wzLJ/dXnh3ScHW2L
-pL8pJjy4qfRhCdkoHdrtCkA1DxMaCrPlB5ylvCJ1NlZC97GHdIV1xhZ59Ezj/76P
-jEGFO/1vFW2Q0rwKcX3xXX4OyM2sP8+3KyRO1aBiP76jDa/p+UEMbd3Xdl6wOhK9
-VSOCgY1E1Lj8+aTgjkzA2RVIq9SOXE2ZdYjKYDugWATxVa7vkYSXZsy7rpRcQ1aj
-oeoTl9OxJtsd0Bg=
+MIIDFTCCAf2gAwIBAgIJAJcmxvLDIe+oMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
+BAMMFnNlcnZpY2VzLmludGVybmV0Mi5lZHUwHhcNMTUxMDA2MTIzODA2WhcNMjUx
+MDA2MTIzODA2WjAhMR8wHQYDVQQDDBZzZXJ2aWNlcy5pbnRlcm5ldDIuZWR1MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvnktqka8ojoq59ZAa4K2KiiM
+m4RUt4v10eeXvHEyd85N5aaHBgaRNhiflrgZ/NeU8skrui7czODaxqBs8XMzuhU4
++KCKgVKiZdpz3BcqjKcuEu9pKCoB9Zunirx21COSOuhytWvlkc4x0bHD/k1Kg+nl
+x3z3RLu+NNDEbCZKDCnb42tN1pwBSyJlUJpfLu30J3u+FrabM/ax1eo5HeMVeNQx
+2+CRFhD2fhJpD91Nt3XNfArHYJabdegNkXq8DL3WlaVZMqkMq6G1fIOO6am+Ey/I
+wKwRUcLmRsY+JBpZ8U9vQYL9yr5L4nBPyVTv+NwonOdZOfNecqZXkCJNd0rBSQID
+AQABo1AwTjAdBgNVHQ4EFgQU/JzAr/YHO8Mh7AzefIMj3hUVSZwwHwYDVR0jBBgw
+FoAU/JzAr/YHO8Mh7AzefIMj3hUVSZwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
+AQsFAAOCAQEAa4VY6C9fpP7NMFJ8ImfDbu97B2n0ZFoCprC3eNRsx0HEbh+26Uk9
+d+yoqH95QvHEB4AKKm3y7dj5jGBvvT480V9Ee0m09ZNGU0n4YWnKky+LqUy9+0R3
+UFNkm3xjIy0yKwyJ6EGo9+5pmvo8tAvjvlwlYHm99YIWAKchFm/v1RrwNZmkUy2N
+WTU70aLaOQq0r3eG3FW+Net1U/dmr28QY4J0UOvD5f2LoWNPXo9xW7N+ZJHd/KsE
+uALfHFGgUGQfHIrJKfHTrdO098Yefwvxh46l/xm9r0c/HKkyfDo5UKPuVOe4srr1
+jNU70ZWm1b9LIxhfoMCYGi7dvyTnW61MVA==
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -94,12 +93,18 @@ oeoTl9OxJtsd0Bg=
       <md:ServiceDescription xml:lang="en">services.internet2.edu provides Internet2 services in support of our Research and Education Networking mission. Current examples include: e-mail lists, Internet2 meeting registration, and trouble ticketing
 for administration of Net+ services.  Planned additions include
 Filesender, the Internet2 Member Portal, and wikis. </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
       <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"/>
       <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
       <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
       <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"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>