denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved auth_method to policy

Browse Source
This commit is contained in:
Andreas Steffen
2006-09-25 06:11:09 +00:00
parent d756cd1bd6
commit b826069dbb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/transactions/ike_auth.c
+7 -5
View File
@@ -262,7 +262,7 @@ static status_t get_request(private_ike_auth_t *this, message_t **result)
} }
/* build certificate payload. TODO: Handle certreq from init_ike_sa. */ /* build certificate payload. TODO: Handle certreq from init_ike_sa. */
if (this->connection->get_auth_method(this->connection) == RSA_DIGITAL_SIGNATURE if (this->policy->get_auth_method(this->policy) == RSA_DIGITAL_SIGNATURE
&& this->connection->get_cert_policy(this->connection) != CERT_NEVER_SEND) && this->connection->get_cert_policy(this->connection) != CERT_NEVER_SEND)
{ {
cert_payload_t *cert_payload; cert_payload_t *cert_payload;
@@ -296,7 +296,7 @@ static status_t get_request(private_ike_auth_t *this, message_t **result)
auth_method_t auth_method; auth_method_t auth_method;
status_t status; status_t status;
auth_method = this->connection->get_auth_method(this->connection); auth_method = this->policy->get_auth_method(this->policy);
authenticator = authenticator_create(this->ike_sa, auth_method); authenticator = authenticator_create(this->ike_sa, auth_method);
status = authenticator->compute_auth_data(authenticator, status = authenticator->compute_auth_data(authenticator,
&auth_payload, &auth_payload,
@@ -328,6 +328,7 @@ static status_t get_request(private_ike_auth_t *this, message_t **result)
this->child_sa = child_sa_create(this->reqid, me, other, my_id, other_id, this->child_sa = child_sa_create(this->reqid, me, other, my_id, other_id,
soft_lifetime, hard_lifetime, soft_lifetime, hard_lifetime,
this->policy->get_updown(this->policy), this->policy->get_updown(this->policy),
this->policy->get_hostaccess(this->policy),
enable_natt); enable_natt);
this->child_sa->set_name(this->child_sa, this->policy->get_name(this->policy)); this->child_sa->set_name(this->child_sa, this->policy->get_name(this->policy));
if (this->child_sa->alloc(this->child_sa, proposal_list) != SUCCESS) if (this->child_sa->alloc(this->child_sa, proposal_list) != SUCCESS)
@@ -711,7 +712,7 @@ static status_t get_response(private_ike_auth_t *this, message_t *request,
response->add_payload(response, (payload_t*)idr_response); response->add_payload(response, (payload_t*)idr_response);
} }
if (this->connection->get_auth_method(this->connection) == RSA_DIGITAL_SIGNATURE if (this->policy->get_auth_method(this->policy) == RSA_DIGITAL_SIGNATURE
&& this->connection->get_cert_policy(this->connection) != CERT_NEVER_SEND) && this->connection->get_cert_policy(this->connection) != CERT_NEVER_SEND)
{ /* build certificate payload */ { /* build certificate payload */
x509_t *cert; x509_t *cert;
@@ -741,7 +742,7 @@ static status_t get_response(private_ike_auth_t *this, message_t *request,
auth_method_t auth_method; auth_method_t auth_method;
status_t status; status_t status;
auth_method = this->connection->get_auth_method(this->connection); auth_method = this->policy->get_auth_method(this->policy);
authenticator = authenticator_create(this->ike_sa, auth_method); authenticator = authenticator_create(this->ike_sa, auth_method);
status = authenticator->verify_auth_data(authenticator, auth_request, status = authenticator->verify_auth_data(authenticator, auth_request,
this->init_request, this->init_request,
@@ -813,6 +814,7 @@ static status_t get_response(private_ike_auth_t *this, message_t *request,
this->child_sa = child_sa_create(this->reqid, me, other, my_id, other_id, this->child_sa = child_sa_create(this->reqid, me, other, my_id, other_id,
soft_lifetime, hard_lifetime, soft_lifetime, hard_lifetime,
this->policy->get_updown(this->policy), this->policy->get_updown(this->policy),
this->policy->get_hostaccess(this->policy),
use_natt); use_natt);
this->child_sa->set_name(this->child_sa, this->policy->get_name(this->policy)); this->child_sa->set_name(this->child_sa, this->policy->get_name(this->policy));
if (install_child_sa(this, FALSE) != SUCCESS) if (install_child_sa(this, FALSE) != SUCCESS)
@@ -957,7 +959,7 @@ static status_t conclude(private_ike_auth_t *this, message_t *response,
identification_t *my_id; identification_t *my_id;
status_t status; status_t status;
auth_method = this->connection->get_auth_method(this->connection); auth_method = this->policy->get_auth_method(this->policy);
authenticator = authenticator_create(this->ike_sa, auth_method); authenticator = authenticator_create(this->ike_sa, auth_method);
my_id = this->policy->get_my_id(this->policy); my_id = this->policy->get_my_id(this->policy);