X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fcore%2Fimpl%2FAssertions.cpp;h=4a163d56d7e6803019e09e10acd4648cd9c45285;hp=4ed2efde32d6abf25735cab4c0e0cb9ec2e2e451;hb=08833e38ed139ad6894f1a568d967da410785587;hpb=593ad7ba2d6188cbf41a502cdf4549e59e6a9d03 diff --git a/saml/saml2/core/impl/Assertions.cpp b/saml/saml2/core/impl/Assertions.cpp index 4ed2efd..4a163d5 100644 --- a/saml/saml2/core/impl/Assertions.cpp +++ b/saml/saml2/core/impl/Assertions.cpp @@ -241,12 +241,14 @@ void EncryptedElementType::encrypt( } } -XMLObject* EncryptedElementType::decrypt(const CredentialResolver& credResolver, const XMLCh* recipient, CredentialCriteria* criteria) const +XMLObject* EncryptedElementType::decrypt( + const CredentialResolver& credResolver, const XMLCh* recipient, CredentialCriteria* criteria, bool requireAuthenticatedCipher + ) const { if (!getEncryptedData()) throw DecryptionException("No encrypted data present."); opensaml::EncryptedKeyResolver ekr(*this); - Decrypter decrypter(&credResolver, criteria, &ekr); + Decrypter decrypter(&credResolver, criteria, &ekr, requireAuthenticatedCipher); DOMDocumentFragment* frag = decrypter.decryptData(*getEncryptedData(), recipient); if (frag->hasChildNodes() && frag->getFirstChild()==frag->getLastChild()) { DOMNode* plaintext=frag->getFirstChild();