diff options
Diffstat (limited to 'src/charon/config/connections')
| -rw-r--r-- | src/charon/config/connections/connection.c | 18 | ||||
| -rw-r--r-- | src/charon/config/connections/connection.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/charon/config/connections/connection.c b/src/charon/config/connections/connection.c index f3c4bddfb..ce1f0f31a 100644 --- a/src/charon/config/connections/connection.c +++ b/src/charon/config/connections/connection.c @@ -72,7 +72,7 @@ struct private_connection_t { /** * should we send a certificate request? */ - cert_policy_t cert_req_policy; + cert_policy_t certreq_policy; /** * should we send a certificates? @@ -122,11 +122,11 @@ static bool is_ikev2 (private_connection_t *this) } /** - * Implementation of connection_t.get_cert_req_policy. + * Implementation of connection_t.get_certreq_policy. */ -static cert_policy_t get_cert_req_policy (private_connection_t *this) +static cert_policy_t get_certreq_policy (private_connection_t *this) { - return this->cert_req_policy; + return this->certreq_policy; } /** @@ -295,7 +295,8 @@ static connection_t *clone(private_connection_t *this) proposal_t *proposal; private_connection_t *clone = (private_connection_t*)connection_create( this->name, this->ikev2, - this->cert_policy, this->cert_req_policy, + this->cert_policy, + this->certreq_policy, this->my_host->clone(this->my_host), this->other_host->clone(this->other_host), this->auth_method); @@ -336,7 +337,8 @@ static void destroy(private_connection_t *this) * Described in header. */ connection_t * connection_create(char *name, bool ikev2, - cert_policy_t cert_policy, cert_policy_t cert_req_policy, + cert_policy_t cert_policy, + cert_policy_t certreq_policy, host_t *my_host, host_t *other_host, auth_method_t auth_method) { @@ -346,7 +348,7 @@ connection_t * connection_create(char *name, bool ikev2, this->public.get_name = (char*(*)(connection_t*))get_name; this->public.is_ikev2 = (bool(*)(connection_t*))is_ikev2; this->public.get_cert_policy = (cert_policy_t(*)(connection_t*))get_cert_policy; - this->public.get_cert_req_policy = (cert_policy_t(*)(connection_t*))get_cert_req_policy; + this->public.get_certreq_policy = (cert_policy_t(*)(connection_t*))get_certreq_policy; this->public.get_my_host = (host_t*(*)(connection_t*))get_my_host; this->public.update_my_host = (void(*)(connection_t*,host_t*))update_my_host; this->public.update_other_host = (void(*)(connection_t*,host_t*))update_other_host; @@ -364,7 +366,7 @@ connection_t * connection_create(char *name, bool ikev2, this->name = strdup(name); this->ikev2 = ikev2; this->cert_policy = cert_policy; - this->cert_req_policy = cert_req_policy; + this->certreq_policy = certreq_policy; this->my_host = my_host; this->other_host = other_host; this->auth_method = auth_method; diff --git a/src/charon/config/connections/connection.h b/src/charon/config/connections/connection.h index 50563da4e..de6cb4616 100644 --- a/src/charon/config/connections/connection.h +++ b/src/charon/config/connections/connection.h @@ -228,7 +228,7 @@ struct connection_t { * @param this calling object * @return - TRUE, if certificate request should be sent */ - cert_policy_t (*get_cert_req_policy) (connection_t *this); + cert_policy_t (*get_certreq_policy) (connection_t *this); /** * @brief Should be sent a certificate for this connection? |