Register builder for md:EncryptionMethod element to fix CPPOST-7.

Add element to example metadata in unit tests.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-opensaml2/trunk@385 fb386ef7-a10c-0410-8ebf-fd3f8e989ab0

diff --git a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
index 2d8294a..79cf31e 100644 (file)
--- a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
+++ b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
@@ -326,6 +326,9 @@ void opensaml::saml2md::registerMetadataClasses() {
     REGISTER_TYPE(RequestedAttribute);
     REGISTER_TYPE(SPSSODescriptor);
 
+    q=QName(SAML20MD_NS,xmlencryption::EncryptionMethod::LOCAL_NAME);
+    XMLObjectBuilder::registerBuilder(q,new xmlencryption::EncryptionMethodBuilder());
+    
     q=QName(samlconstants::SAML1MD_NS,SourceID::LOCAL_NAME);
     XMLObjectBuilder::registerBuilder(q,new SourceIDBuilder());
     SchemaValidators.registerValidator(q,new SourceIDSchemaValidator());

diff --git a/samltest/data/binding/example-metadata.xml b/samltest/data/binding/example-metadata.xml
index d09818b..c6d275e 100644 (file)
--- a/samltest/data/binding/example-metadata.xml
+++ b/samltest/data/binding/example-metadata.xml
@@ -27,7 +27,8 @@
                             gmYsTmak+kxO93JprrOd9xp8aZPMEprL7VCdrhbZEfyYER0=\r
                         </ds:X509Certificate>\r
                     </ds:X509Data>\r
-                </ds:KeyInfo>\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