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

1 files changed, 43 insertions, 71 deletions

diff --git a/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
index 46f75116..61af4fa6 100644
--- a/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
@@ -1,82 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-secure.nature.com/shibboleth">
-  <!--
-		This is an OpenAthens 2 (test) service provider for Nature Publishing Group (Macmillan Publishers Limited).
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-secure.nature.com/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						MIIDPjCCAiagAwIBAgIET2caITANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJV
+						MIIDYTCCAkmgAwIBAgIEEtvGRDANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEfMB0GA1UEAxMWdGVzdC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xMjAzMTkx
-						MTM2MDFaFw0xNTAzMTkxMTM2MDFaMGExCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZM
+						A05QRzEfMB0GA1UEAxMWdGVzdC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xNTAzMTMw
+						NDMwMDNaFw0yNTAzMTAwNDMwMDNaMGExCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZM
 						b25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBHMR8wHQYDVQQD
 						ExZ0ZXN0LXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAloYBXDytAMlqZ8QR8WUEylHacH6PxyMHYlwXrNIHGG4XgH9n9cU5
-						3EQO03KWMmCx7ERrLumsMEKHHDf/h5Hh9VP3s8eaQ6bC80I7eAf2nKSK7DQdTnoW
-						j+e86xBduqTiBqm9bc4G5lBtfUpGM9l/oTBXTpjrM6T78bhNfaTARRKS+CCPmh8X
-						VosCN59DbdT0R3QAkcee2gzvAfJRbij2yVty0zlOECmyMilMmIhdvhU6+hNNi9s4
-						/uvuWQ9SNHxNYhhjljHX8iKAd2cPAf1FT6MOBbXZvPpTKxiE0mdOFNo/tAx5vlSA
-						bjVmhTbGFbSLgCwdsP40d5xz3bV5qE427wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQAHQDwA52lJAzlFkV+S6HZ4C2U0KuyE8471M5s1x1Wgm0QKGMuD/ekLJw9wsnln
-						BkElfghY1z/bEpWTHc8O8l3tTGPWTzvSk7ytpgF/L7z4eT1qkaqxayLbvc+TVVnr
-						3cLynjMgfs2h0DBWdCzh/Nb+ErDv3nW6EwUBunIkjkDENvgB9UMdwSZ2em9tKeXi
-						LBM4390C8AC2L/6OtivmKueQt9RNG78rDXp3dmAVNtesGvTY2bL3k7m3FK+oebpT
-						XEuw2IeEFSEmWoJEeZY4twKNYzlqgbv8LuBMo0f+LQ5Lw2JD/nDF1yE5VgYUt3VB
-						W4f1MJLtYPQX+ej4Mx3Q3Udl
+						MIIBCgKCAQEAypds9PRwonxwlhtZHpjlmr/eIbF5UeEkXn3FU6FrjxOGJIlbqrI5
+						1UCMhNAQ/YDI1BKCu/865DTWy5qezeWDbJ5QybVHlfSqpnLu6OxufrBb0oQEEzGD
+						dM6BjMrPNagW4h8o8JwXC3vE0AIcmlrGWSl/a1jUXBag3tPm+6c8qr44gf9YyYcb
+						QnrIApdojwC3pxJpekz2k+wYDo52/meiFlQK6OYVTk/OlYIM31o+bLIW7nucrPl3
+						TJz9+Bmyenvh4qzZbqycmpQYL62z0cp5oa9SrupPVk8MWi1Xr8cxvu5TBbZZCbtR
+						uwRu3LmyvQVQejuR5VzHGJII2ktGQQwX6QIDAQABoyEwHzAdBgNVHQ4EFgQUHBsn
+						w1SEAY+N9dCCaqIDtBQpgIowDQYJKoZIhvcNAQELBQADggEBABCYwuoU2vsW0hk6
+						le8Ho83OQ8EAZTI5yGCcDecuQUru0MZJo3KfZbDpKKHrW7mpDpq9kLeu/MSKA/fg
+						p+eodmkQOZRdVUUw6EU0cfW34iUyHl+HbZjbqsToZfsH+VTSmTpMgtl0USpP5nzC
+						Ke6J0nxG735cQN08JRACzZsETdMfvAuf8Oxl61yKpVNwDWMpsysJfu86VNL/MfGo
+						kX13GFA7+EqYZaZEPXZXjq4EKhwMQfZDabw3ENuijJ4JAq2n4ikVmLRBCkqElxuA
+						fnksTUIwbxyHGAEh+bqqgcm1tQi/auufi2bQHPQ77DJSGuVzUgz/qbZU8CJ7uATR
+						wsW5loM=
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPjCCAiagAwIBAgIET2caITANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEfMB0GA1UEAxMWdGVzdC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xMjAzMTkx
-						MTM2MDFaFw0xNTAzMTkxMTM2MDFaMGExCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZM
-						b25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBHMR8wHQYDVQQD
-						ExZ0ZXN0LXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAloYBXDytAMlqZ8QR8WUEylHacH6PxyMHYlwXrNIHGG4XgH9n9cU5
-						3EQO03KWMmCx7ERrLumsMEKHHDf/h5Hh9VP3s8eaQ6bC80I7eAf2nKSK7DQdTnoW
-						j+e86xBduqTiBqm9bc4G5lBtfUpGM9l/oTBXTpjrM6T78bhNfaTARRKS+CCPmh8X
-						VosCN59DbdT0R3QAkcee2gzvAfJRbij2yVty0zlOECmyMilMmIhdvhU6+hNNi9s4
-						/uvuWQ9SNHxNYhhjljHX8iKAd2cPAf1FT6MOBbXZvPpTKxiE0mdOFNo/tAx5vlSA
-						bjVmhTbGFbSLgCwdsP40d5xz3bV5qE427wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQAHQDwA52lJAzlFkV+S6HZ4C2U0KuyE8471M5s1x1Wgm0QKGMuD/ekLJw9wsnln
-						BkElfghY1z/bEpWTHc8O8l3tTGPWTzvSk7ytpgF/L7z4eT1qkaqxayLbvc+TVVnr
-						3cLynjMgfs2h0DBWdCzh/Nb+ErDv3nW6EwUBunIkjkDENvgB9UMdwSZ2em9tKeXi
-						LBM4390C8AC2L/6OtivmKueQt9RNG78rDXp3dmAVNtesGvTY2bL3k7m3FK+oebpT
-						XEuw2IeEFSEmWoJEeZY4twKNYzlqgbv8LuBMo0f+LQ5Lw2JD/nDF1yE5VgYUt3VB
-						W4f1MJLtYPQX+ej4Mx3Q3Udl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nature Publishing Group (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>