Multi-line svn commit, see body.

[shibboleth/cpp-opensaml.git] / samltest / data / binding / example-metadata.xml

diff --git a/samltest/data/binding/example-metadata.xml b/samltest/data/binding/example-metadata.xml
index f4e82f8..c6d275e 100644 (file)
--- a/samltest/data/binding/example-metadata.xml
+++ b/samltest/data/binding/example-metadata.xml
@@ -6,10 +6,29 @@
        <EntityDescriptor entityID="https://idp.example.org/">\r
                \r
                <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">\r
-                       <KeyDescriptor use="signing">\r
-                           <ds:KeyInfo>\r
-                               <ds:RetrievalMethod URI="#samplekey" Type="http://www.w3.org/2000/09/xmldsig#X509Data"/>
-                           </ds:KeyInfo>\r
+                       <KeyDescriptor>\r
+                <ds:KeyInfo>\r
+                    <ds:KeyName>sp.example.org</ds:KeyName>\r
+                    <ds:X509Data>\r
+                        <ds:X509Certificate>\r
+                            MIICjzCCAfigAwIBAgIJAKk8t1hYcMkhMA0GCSqGSIb3DQEBBAUAMDoxCzAJBgNV\r
+                            BAYTAlVTMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDnNwLmV4YW1wbGUu\r
+                            b3JnMB4XDTA1MDYyMDE1NDgzNFoXDTMyMTEwNTE1NDgzNFowOjELMAkGA1UEBhMC\r
+                            VVMxEjAQBgNVBAoTCUludGVybmV0MjEXMBUGA1UEAxMOc3AuZXhhbXBsZS5vcmcw\r
+                            gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANlZ1L1mKzYbUVKiMQLhZlfGDyYa\r
+                            /jjCiaXP0WhLNgvJpOTeajvsrApYNnFX5MLNzuC3NeQIjXUNLN2Yo2MCSthBIOL5\r
+                            qE5dka4z9W9zytoflW1LmJ8vXpx8Ay/meG4z//J5iCpYVEquA0xl28HUIlownZUF\r
+                            7w7bx0cF/02qrR23AgMBAAGjgZwwgZkwHQYDVR0OBBYEFJZiO1qsyAyc3HwMlL9p\r
+                            JpN6fbGwMGoGA1UdIwRjMGGAFJZiO1qsyAyc3HwMlL9pJpN6fbGwoT6kPDA6MQsw\r
+                            CQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5zcC5leGFt\r
+                            cGxlLm9yZ4IJAKk8t1hYcMkhMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD\r
+                            gYEAMFq/UeSQyngE0GpZueyD2UW0M358uhseYOgGEIfm+qXIFQF6MYwNoX7WFzhC\r
+                            LJZ2E6mEvZZFHCHUtl7mGDvsRwgZ85YCtRbvleEpqfgNQToto9pLYe+X6vvH9Z6p\r
+                            gmYsTmak+kxO93JprrOd9xp8aZPMEprL7VCdrhbZEfyYER0=\r
+                        </ds:X509Certificate>\r
+                    </ds:X509Data>\r
+                </ds:KeyInfo>
+                <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>\r
                        </KeyDescriptor>\r
 \r
                        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:protocol"\r
@@ -31,8 +50,9 @@
        <EntityDescriptor entityID="https://sp.example.org/">\r
        \r
                <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">\r
-                       <KeyDescriptor use="signing">\r
-                               <ds:KeyInfo Id="samplekey">\r
+                       <KeyDescriptor>\r
+                               <ds:KeyInfo>\r
+                                       <ds:KeyName>sp.example.org</ds:KeyName>\r
                                <ds:X509Data>
                                        <ds:X509Certificate>
                                                MIICjzCCAfigAwIBAgIJAKk8t1hYcMkhMA0GCSqGSIb3DQEBBAUAMDoxCzAJBgNV