diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2010-07-16 19:34:28 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2010-07-16 19:34:28 +0000 |
| commit | 8b385af8e601e7409d2ec4378f0386a0f4895699 (patch) | |
| tree | e8d65d3b040b31f37978ca9abe921bd6d1c9269b | |
| parent | ad93e9f8310592f61fc07e79791eb6d8f17e64fc (diff) | |
[ID-FFv1.2] move all user of lasso_node_export_to_query to lasso_node_export_to_query_with_password
| -rw-r--r-- | lasso/id-ff/defederation.c | 5 | ||||
| -rw-r--r-- | lasso/id-ff/login.c | 9 | ||||
| -rw-r--r-- | lasso/id-ff/logout.c | 15 | ||||
| -rw-r--r-- | lasso/id-ff/name_registration.c | 10 |
4 files changed, 23 insertions, 16 deletions
diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c index 2d26bdee..062a5beb 100644 --- a/lasso/id-ff/defederation.c +++ b/lasso/id-ff/defederation.c @@ -117,9 +117,10 @@ lasso_defederation_build_notification_msg(LassoDefederation *defederation) if (url == NULL) { return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL); } - query = lasso_node_export_to_query(LASSO_NODE(profile->request), + query = lasso_node_export_to_query_with_password(LASSO_NODE(profile->request), profile->server->signature_method, - profile->server->private_key); + profile->server->private_key, + profile->server->private_key_password); if (query == NULL) { lasso_release(url); diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c index 4a9c8466..b098dbfe 100644 --- a/lasso/id-ff/login.c +++ b/lasso/id-ff/login.c @@ -1147,12 +1147,13 @@ lasso_login_build_authn_request_msg(LassoLogin *login) if (login->http_method == LASSO_HTTP_METHOD_REDIRECT) { /* REDIRECT -> query */ if (must_sign) { - query = lasso_node_export_to_query(LASSO_NODE(profile->request), + query = lasso_node_export_to_query_with_password(LASSO_NODE(profile->request), profile->server->signature_method, - profile->server->private_key); + profile->server->private_key, + profile->server->private_key_password); } else { - query = lasso_node_export_to_query( - LASSO_NODE(profile->request), 0, NULL); + query = lasso_node_export_to_query_with_password( + LASSO_NODE(profile->request), 0, NULL, NULL); } if (query == NULL) { return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED); diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c index 9e954255..2e6a2d81 100644 --- a/lasso/id-ff/logout.c +++ b/lasso/id-ff/logout.c @@ -326,9 +326,10 @@ lasso_logout_build_request_msg(LassoLogout *logout) if (url == NULL) { return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL); } - query = lasso_node_export_to_query(LASSO_NODE(profile->request), + query = lasso_node_export_to_query_with_password(LASSO_NODE(profile->request), profile->server->signature_method, - profile->server->private_key); + profile->server->private_key, + profile->server->private_key_password); if (query == NULL) { lasso_release(url); return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED); @@ -452,9 +453,10 @@ lasso_logout_build_response_msg(LassoLogout *logout) * something like the document root of the other site ? */ return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL); } - query = lasso_node_export_to_query(profile->response, + query = lasso_node_export_to_query_with_password(profile->response, profile->server->signature_method, - profile->server->private_key); + profile->server->private_key, + profile->server->private_key_password); if (query == NULL) { lasso_release(url); return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED); @@ -889,9 +891,10 @@ lasso_logout_process_response_msg(LassoLogout *logout, gchar *response_msg) if (url == NULL) { return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL); } - query = lasso_node_export_to_query(LASSO_NODE(profile->request), + query = lasso_node_export_to_query_with_password(LASSO_NODE(profile->request), profile->server->signature_method, - profile->server->private_key); + profile->server->private_key, + profile->server->private_key_password); if (query == NULL) { lasso_release(url); return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED); diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c index 59d59d80..056d6295 100644 --- a/lasso/id-ff/name_registration.c +++ b/lasso/id-ff/name_registration.c @@ -104,9 +104,10 @@ lasso_name_registration_build_request_msg(LassoNameRegistration *name_registrati if (url == NULL) { return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL); } - query = lasso_node_export_to_query(LASSO_NODE(profile->request), + query = lasso_node_export_to_query_with_password(LASSO_NODE(profile->request), profile->server->signature_method, - profile->server->private_key); + profile->server->private_key, + profile->server->private_key_password); if (query == NULL) { lasso_release(url); return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED); @@ -188,9 +189,10 @@ lasso_name_registration_build_response_msg(LassoNameRegistration *name_registrat if (url == NULL) { return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL); } - query = lasso_node_export_to_query(LASSO_NODE(profile->response), + query = lasso_node_export_to_query_with_password(LASSO_NODE(profile->response), profile->server->signature_method, - profile->server->private_key); + profile->server->private_key, + profile->server->private_key_password); if (query == NULL) { lasso_release(url); return critical_error(LASSO_PROFILE_ERROR_BUILDING_QUERY_FAILED); |