diff options
| -rw-r--r-- | lasso/id-ff/login.c | 4 | ||||
| -rw-r--r-- | lasso/saml-2.0/login.c | 2 | ||||
| -rw-r--r-- | lasso/saml-2.0/logout.c | 2 | ||||
| -rw-r--r-- | lasso/saml-2.0/name_id_management.c | 2 | ||||
| -rw-r--r-- | lasso/saml-2.0/profile.c | 4 | ||||
| -rw-r--r-- | lasso/saml-2.0/profileprivate.h | 4 | ||||
| -rw-r--r-- | lasso/saml-2.0/saml2_helper.c | 5 |
7 files changed, 10 insertions, 13 deletions
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c index 33abd6b1..67d6b4c3 100644 --- a/lasso/id-ff/login.c +++ b/lasso/id-ff/login.c @@ -1272,8 +1272,8 @@ lasso_login_destroy(LassoLogin *login) /** * lasso_login_init_authn_request: * @login: a #LassoLogin - * @remote_providerID: the providerID of the identity provider (may be NULL) - * @http_method: HTTP method to use for request transmission + * @remote_providerID:(allow-none): the providerID of the identity provider (may be NULL) + * @http_method:(default LASSO_HTTP_METHOD_REDIRECT): HTTP method to use for request transmission * * <para>Initializes a new AuthnRequest from current service provider to remote * identity provider specified in @remote_providerID (if NULL the first known diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c index 1f0765f0..a3bdc87c 100644 --- a/lasso/saml-2.0/login.c +++ b/lasso/saml-2.0/login.c @@ -74,7 +74,7 @@ lasso_saml20_login_init_authn_request(LassoLogin *login, LassoHttpMethod http_me /* new */ request = (LassoSamlp2RequestAbstract*)lasso_samlp2_authn_request_new(); - lasso_check_good_rc(lasso_saml20_init_request(profile, profile->remote_providerID, FALSE, + lasso_check_good_rc(lasso_saml20_profile_init_request(profile, profile->remote_providerID, FALSE, request, http_method, LASSO_MD_PROTOCOL_TYPE_SINGLE_SIGN_ON)); /* FIXME: keep old behaviour */ diff --git a/lasso/saml-2.0/logout.c b/lasso/saml-2.0/logout.c index 1bc8bd82..ac64e02d 100644 --- a/lasso/saml-2.0/logout.c +++ b/lasso/saml-2.0/logout.c @@ -66,7 +66,7 @@ lasso_saml20_logout_init_request(LassoLogout *logout, LassoProvider *remote_prov logout_request = (LassoSamlp2LogoutRequest*) lasso_samlp2_logout_request_new(); - lasso_check_good_rc(lasso_saml20_init_request(profile, + lasso_check_good_rc(lasso_saml20_profile_init_request(profile, remote_provider->ProviderID, FALSE, &logout_request->parent, diff --git a/lasso/saml-2.0/name_id_management.c b/lasso/saml-2.0/name_id_management.c index b98ccf0c..e6f7f4da 100644 --- a/lasso/saml-2.0/name_id_management.c +++ b/lasso/saml-2.0/name_id_management.c @@ -83,7 +83,7 @@ lasso_name_id_management_init_request(LassoNameIdManagement *name_id_management, request = (LassoSamlp2RequestAbstract*)lasso_samlp2_manage_name_id_request_new(); manage_name_id_request = LASSO_SAMLP2_MANAGE_NAME_ID_REQUEST(request); - lasso_check_good_rc(lasso_saml20_init_request(profile, remote_provider_id, TRUE, request, + lasso_check_good_rc(lasso_saml20_profile_init_request(profile, remote_provider_id, TRUE, request, http_method, LASSO_MD_PROTOCOL_TYPE_MANAGE_NAME_ID)); lasso_assign_gobject(manage_name_id_request->NameID, (LassoSaml2NameID*)profile->nameIdentifier); diff --git a/lasso/saml-2.0/profile.c b/lasso/saml-2.0/profile.c index 3a337ee2..cc35c2e3 100644 --- a/lasso/saml-2.0/profile.c +++ b/lasso/saml-2.0/profile.c @@ -656,7 +656,7 @@ cleanup: } int -lasso_saml20_init_request(LassoProfile *profile, +lasso_saml20_profile_init_request(LassoProfile *profile, const char *remote_provider_id, gboolean first_in_session, LassoSamlp2RequestAbstract *request_abstract, @@ -1327,7 +1327,7 @@ cleanup: } gint -lasso_saml20_build_http_redirect_query_simple(LassoProfile *profile, +lasso_saml20_profile_build_http_redirect_query_simple(LassoProfile *profile, LassoNode *msg, const char *profile_name, gboolean is_response) diff --git a/lasso/saml-2.0/profileprivate.h b/lasso/saml-2.0/profileprivate.h index 6efc7f4d..04677633 100644 --- a/lasso/saml-2.0/profileprivate.h +++ b/lasso/saml-2.0/profileprivate.h @@ -36,7 +36,7 @@ extern "C" { #include "../xml/saml-2.0/samlp2_request_abstract.h" #include "../id-ff/provider.h" -int lasso_saml20_init_request(LassoProfile *profile, const char *remote_provider_id, +int lasso_saml20_profile_init_request(LassoProfile *profile, const char *remote_provider_id, gboolean first_in_session, LassoSamlp2RequestAbstract *request_abstract, LassoHttpMethod http_method, LassoMdProtocolType protocol_type); char* lasso_saml20_profile_generate_artifact(LassoProfile *profile, int part); @@ -69,7 +69,7 @@ int lasso_saml20_profile_build_response_msg(LassoProfile *profile, char *service int lasso_saml20_profile_init_response(LassoProfile *profile, LassoSamlp2StatusResponse *status_response, const char *status_code1, const char *status_code2); int lasso_saml20_profile_validate_request(LassoProfile *profile, gboolean needs_identity, LassoSamlp2StatusResponse *status_response, LassoProvider **provider_out); -gint lasso_saml20_build_http_redirect_query_simple(LassoProfile *profile, LassoNode *msg, +gint lasso_saml20_profile_build_http_redirect_query_simple(LassoProfile *profile, LassoNode *msg, const char *profile_name, gboolean is_response); gint lasso_saml20_profile_build_http_redirect(LassoProfile *profile, LassoNode *msg, const char *url); diff --git a/lasso/saml-2.0/saml2_helper.c b/lasso/saml-2.0/saml2_helper.c index d8e00f43..91c2a336 100644 --- a/lasso/saml-2.0/saml2_helper.c +++ b/lasso/saml-2.0/saml2_helper.c @@ -285,18 +285,15 @@ lasso_saml2_assertion_set_subject_confirmation_data(LassoSaml2Assertion *saml2_a } /** - * lasso_saml2_set_conditions: + * lasso_saml2_assertion_set_basic_conditions: * @tolerance:(default -1): tolerance to the range of time when the assertion is valid * @length:(default -1): length of the range of time when the assertion is valid - * @audience_restriction:(allow-none): a providerID to restrict the assertion audience to * @one_time_use:(default FALSE): can the assertion be kept or should it be used immediately - * @proxy_count:(default -1): number of hops of proxies * * Set conditions limiting usage of the assertion. * * @tolerance and @length are time quantity measured in seconds, it defines the time range in which * the assertion is valid, it is computed as [now()-tolerance, now()+length+tolerance]. - * @audience_restriction allows to limit the target of the assertion. * @one_time_use allows the issuer to limit caching of the assertion. * @proxy_count specify how many proxy hop can be traversed before this assertion should lose any trust. * |