diff options
Diffstat (limited to 'src/libcharon/sa')
-rw-r--r-- | src/libcharon/sa/authenticators/authenticator.h | 6 | ||||
-rw-r--r-- | src/libcharon/sa/tasks/child_create.c | 6 | ||||
-rw-r--r-- | src/libcharon/sa/tasks/ike_init.c | 6 | ||||
-rw-r--r-- | src/libcharon/sa/tasks/main_mode.c | 8 | ||||
-rw-r--r-- | src/libcharon/sa/tasks/quick_mode.c | 8 |
5 files changed, 18 insertions, 16 deletions
diff --git a/src/libcharon/sa/authenticators/authenticator.h b/src/libcharon/sa/authenticators/authenticator.h index d27e006a3..a3850bb7f 100644 --- a/src/libcharon/sa/authenticators/authenticator.h +++ b/src/libcharon/sa/authenticators/authenticator.h @@ -34,6 +34,12 @@ typedef struct authenticator_t authenticator_t; * Method to use for authentication, as defined in IKEv2. */ enum auth_method_t { + + /** + * No authentication used. + */ + AUTH_NONE = 0, + /** * Computed as specified in section 2.15 of RFC using * an RSA private key over a PKCS#1 padded hash. diff --git a/src/libcharon/sa/tasks/child_create.c b/src/libcharon/sa/tasks/child_create.c index e40f34dc9..79d082138 100644 --- a/src/libcharon/sa/tasks/child_create.c +++ b/src/libcharon/sa/tasks/child_create.c @@ -527,13 +527,11 @@ static void build_payloads(private_child_create_t *this, message_t *message) /* add SA payload */ if (this->initiator) { - sa_payload = sa_payload_create_from_proposal_list(SECURITY_ASSOCIATION, - this->proposals); + sa_payload = sa_payload_create_from_proposals_v2(this->proposals); } else { - sa_payload = sa_payload_create_from_proposal(SECURITY_ASSOCIATION, - this->proposal); + sa_payload = sa_payload_create_from_proposal_v2(this->proposal); } message->add_payload(message, (payload_t*)sa_payload); diff --git a/src/libcharon/sa/tasks/ike_init.c b/src/libcharon/sa/tasks/ike_init.c index 868680bb6..3b0c4e8f8 100644 --- a/src/libcharon/sa/tasks/ike_init.c +++ b/src/libcharon/sa/tasks/ike_init.c @@ -133,8 +133,7 @@ static void build_payloads(private_ike_init_t *this, message_t *message) enumerator->destroy(enumerator); } - sa_payload = sa_payload_create_from_proposal_list(SECURITY_ASSOCIATION, - proposal_list); + sa_payload = sa_payload_create_from_proposals_v2(proposal_list); proposal_list->destroy_offset(proposal_list, offsetof(proposal_t, destroy)); } else @@ -144,8 +143,7 @@ static void build_payloads(private_ike_init_t *this, message_t *message) /* include SPI of new IKE_SA when we are rekeying */ this->proposal->set_spi(this->proposal, id->get_responder_spi(id)); } - sa_payload = sa_payload_create_from_proposal(SECURITY_ASSOCIATION, - this->proposal); + sa_payload = sa_payload_create_from_proposal_v2(this->proposal); } message->add_payload(message, (payload_t*)sa_payload); diff --git a/src/libcharon/sa/tasks/main_mode.c b/src/libcharon/sa/tasks/main_mode.c index f59276714..12ec5f71b 100644 --- a/src/libcharon/sa/tasks/main_mode.c +++ b/src/libcharon/sa/tasks/main_mode.c @@ -299,8 +299,8 @@ METHOD(task_t, build_i, status_t, proposals = this->ike_cfg->get_proposals(this->ike_cfg); - sa_payload = sa_payload_create_from_proposal_list( - SECURITY_ASSOCIATION_V1, proposals); + sa_payload = sa_payload_create_from_proposals_v1(proposals, + 0, 0, AUTH_NONE, MODE_NONE, FALSE); proposals->destroy_offset(proposals, offsetof(proposal_t, destroy)); message->add_payload(message, &sa_payload->payload_interface); @@ -573,8 +573,8 @@ METHOD(task_t, build_r, status_t, { sa_payload_t *sa_payload; - sa_payload = sa_payload_create_from_proposal(SECURITY_ASSOCIATION_V1, - this->proposal); + sa_payload = sa_payload_create_from_proposal_v1(this->proposal, + 0, 0, AUTH_NONE, MODE_NONE, FALSE); message->add_payload(message, &sa_payload->payload_interface); return NEED_MORE; diff --git a/src/libcharon/sa/tasks/quick_mode.c b/src/libcharon/sa/tasks/quick_mode.c index eb9312d2b..1d5e6b521 100644 --- a/src/libcharon/sa/tasks/quick_mode.c +++ b/src/libcharon/sa/tasks/quick_mode.c @@ -425,8 +425,8 @@ METHOD(task_t, build_i, status_t, } enumerator->destroy(enumerator); - sa_payload = sa_payload_create_from_proposal_list( - SECURITY_ASSOCIATION_V1, list); + sa_payload = sa_payload_create_from_proposals_v1(list, + 0, 0, AUTH_NONE, MODE_NONE, FALSE); list->destroy_offset(list, offsetof(proposal_t, destroy)); message->add_payload(message, &sa_payload->payload_interface); @@ -551,8 +551,8 @@ METHOD(task_t, build_r, status_t, } this->proposal->set_spi(this->proposal, this->spi_r); - sa_payload = sa_payload_create_from_proposal( - SECURITY_ASSOCIATION_V1, this->proposal); + sa_payload = sa_payload_create_from_proposal_v1(this->proposal, + 0, 0, AUTH_NONE, MODE_NONE, FALSE); message->add_payload(message, &sa_payload->payload_interface); if (!add_nonce(this, &this->nonce_r, message)) |