summaryrefslogtreecommitdiffstats
path: root/lasso/xml
diff options
context:
space:
mode:
authorBenjamin Dauvergne <bdauvergne@entrouvert.com>2010-12-14 01:57:09 +0100
committerBenjamin Dauvergne <bdauvergne@entrouvert.com>2010-12-14 01:57:09 +0100
commit355df68dfed94e21726cf5ef7b0747623dbdcf4a (patch)
treebc62bc00a4dedb3334394b93f02b11ef43644082 /lasso/xml
parentec5ec161f7d957e86b44310d8f2b5bb604613196 (diff)
downloadlasso-355df68dfed94e21726cf5ef7b0747623dbdcf4a.tar.gz
lasso-355df68dfed94e21726cf5ef7b0747623dbdcf4a.tar.xz
lasso-355df68dfed94e21726cf5ef7b0747623dbdcf4a.zip
[saml2] use new encryption structure instead for internal field in LassoSaml2Assertion
Diffstat (limited to 'lasso/xml')
-rw-r--r--lasso/xml/tools.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index f73e93e4..9a91ccc3 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -589,16 +589,17 @@ LassoNode*
lasso_assertion_encrypt(LassoSaml2Assertion *assertion, char *recipient)
{
xmlSecKey *encryption_public_key = NULL;
+ LassoEncryptionSymKeyType encryption_sym_key_type = 0;
LassoNode *ret = NULL;
- if (assertion->encryption_activated == FALSE ||
- assertion->encryption_public_key_str == NULL) {
+ lasso_node_get_encryption((LassoNode*)assertion, &encryption_public_key,
+ &encryption_sym_key_type);
+ if (! encryption_public_key) {
return NULL;
}
- encryption_public_key = lasso_xmlsec_load_private_key(assertion->encryption_public_key_str, NULL);
ret = LASSO_NODE(lasso_node_encrypt(LASSO_NODE(assertion),
- encryption_public_key, assertion->encryption_sym_key_type, recipient));
+ encryption_public_key, encryption_sym_key_type, recipient));
lasso_release_sec_key(encryption_public_key);
return ret;