summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Peters <fpeters@entrouvert.com>2004-11-26 10:00:22 +0000
committerFrederic Peters <fpeters@entrouvert.com>2004-11-26 10:00:22 +0000
commitebd6acd6d72b22d292789cb082cf4d808877b48c (patch)
tree8fd783869a26e139beab9f454d095d5a5ea03e95
parent0cf839190ee3245687115beec5f1aa82a17f652f (diff)
downloadlasso-ebd6acd6d72b22d292789cb082cf4d808877b48c.tar.gz
lasso-ebd6acd6d72b22d292789cb082cf4d808877b48c.tar.xz
lasso-ebd6acd6d72b22d292789cb082cf4d808877b48c.zip
signature for FederatationTerminationNotification; preparation for
AuthnResponse.
-rw-r--r--lasso/id-ff/defederation.c11
-rw-r--r--lasso/id-ff/login.c15
2 files changed, 7 insertions, 19 deletions
diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c
index 55ad5d77..36273524 100644
--- a/lasso/id-ff/defederation.c
+++ b/lasso/id-ff/defederation.c
@@ -79,17 +79,10 @@ lasso_defederation_build_notification_msg(LassoDefederation *defederation)
/* build the federation termination notification message (SOAP or HTTP-Redirect) */
if (profile->http_request_method == LASSO_HTTP_METHOD_SOAP) {
-#if 0 /* XXX: signatures are done differently */
- /* sign the request message */
- lasso_samlp_request_abstract_sign_signature_tmpl(
- LASSO_SAMLP_REQUEST_ABSTRACT(profile->request),
- profile->server->private_key,
- profile->server->certificate);
-#endif
-
/* build the logout request message */
profile->msg_url = lasso_provider_get_metadata_one(remote_provider, "SoapEndpoint");
- profile->msg_body = lasso_node_export_to_soap(profile->request, NULL, NULL);
+ profile->msg_body = lasso_node_export_to_soap(profile->request,
+ profile->server->private_key, profile->server->certificate);
}
if (profile->http_request_method == LASSO_HTTP_METHOD_REDIRECT) {
/* build and optionaly sign the query message and build the
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 053c49bb..ef32988b 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -628,17 +628,12 @@ lasso_login_build_authn_request_msg(LassoLogin *login, const gchar *remote_provi
g_free(url);
}
if (login->http_method == LASSO_HTTP_METHOD_POST) {
- /* POST -> form */
-#if 0 /* XXX: signatures are done differently */
- if (must_sign) {
- ret = lasso_samlp_request_abstract_sign_signature_tmpl(
- LASSO_SAMLP_REQUEST_ABSTRACT(LASSO_PROFILE(login)->request),
- LASSO_PROFILE(login)->server->private_key,
- LASSO_PROFILE(login)->server->certificate);
- if (ret < 0)
- goto done;
+ char *private_key = NULL, *certificate = NULL;
+ if (! must_sign) {
+ private_key = LASSO_PROFILE(login)->server->private_key;
+ certificate = LASSO_PROFILE(login)->server->certificate;
}
-#endif
+ /* XXX: lareq may need to be signed */
lareq = lasso_node_export_to_base64(LASSO_PROFILE(login)->request);
if (lareq == NULL) {