projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
de43a76
)
Use GCM in test when possible.
author
Scott Cantor
<cantor.2@osu.edu>
Sun, 24 Jun 2012 20:17:19 +0000
(20:17 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Sun, 24 Jun 2012 20:17:19 +0000
(20:17 +0000)
samltest/encryption/EncryptedAssertionTest.h
patch
|
blob
|
history
diff --git
a/samltest/encryption/EncryptedAssertionTest.h
b/samltest/encryption/EncryptedAssertionTest.h
index
33d701b
..
43eb34c
100644
(file)
--- a/
samltest/encryption/EncryptedAssertionTest.h
+++ b/
samltest/encryption/EncryptedAssertionTest.h
@@
-29,6
+29,7
@@
#include <saml/saml2/metadata/MetadataCredentialContext.h>
#include <saml/saml2/metadata/MetadataCredentialCriteria.h>
#include <xmltooling/security/Credential.h>
#include <saml/saml2/metadata/MetadataCredentialContext.h>
#include <saml/saml2/metadata/MetadataCredentialCriteria.h>
#include <xmltooling/security/Credential.h>
+#include <xsec/dsig/DSIGConstants.hpp>
using namespace opensaml::saml2md;
using namespace opensaml::saml2;
using namespace opensaml::saml2md;
using namespace opensaml::saml2;
@@
-125,8
+126,12
@@
public:
vector< pair<const MetadataProvider*,MetadataCredentialCriteria*> > recipients(
1, pair<const MetadataProvider*,MetadataCredentialCriteria*>(m_metadata, &mcc)
);
vector< pair<const MetadataProvider*,MetadataCredentialCriteria*> > recipients(
1, pair<const MetadataProvider*,MetadataCredentialCriteria*>(m_metadata, &mcc)
);
+#ifdef XSEC_OPENSSL_HAVE_GCM
+ encrypted->encrypt(*assertion.get(), recipients, false, DSIGConstants::s_unicodeStrURIAES256_GCM);
+#else
encrypted->encrypt(*assertion.get(), recipients);
encrypted->encrypt(*assertion.get(), recipients);
-
+#endif
+
// Roundtrip it.
string buf;
XMLHelper::serialize(encrypted->marshall(), buf);
// Roundtrip it.
string buf;
XMLHelper::serialize(encrypted->marshall(), buf);