ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Renamed ike_cert_pre_v1 to isakmp_cert_pre

This commit is contained in:
Martin Willi 2011-12-19 11:17:31 +01:00
parent 0aa2af5efc
commit 824dc0adad
7 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcharon/Makefile.am
View File

@ -84,7 +84,6 @@ sa/tasks/child_rekey.c sa/tasks/child_rekey.h \
sa/tasks/ike_auth.c sa/tasks/ike_auth.h \
sa/tasks/ike_cert_pre.c sa/tasks/ike_cert_pre.h \
sa/tasks/ike_cert_post.c sa/tasks/ike_cert_post.h \
sa/tasks/ike_cert_pre_v1.c sa/tasks/ike_cert_pre_v1.h \
sa/tasks/ike_config.c sa/tasks/ike_config.h \
sa/tasks/ike_delete.c sa/tasks/ike_delete.h \
sa/tasks/ike_dpd.c sa/tasks/ike_dpd.h \
@ -99,6 +98,7 @@ sa/tasks/ike_vendor.c sa/tasks/ike_vendor.h \
sa/tasks/ike_vendor_v1.c sa/tasks/ike_vendor_v1.h \
sa/tasks/main_mode.c sa/tasks/main_mode.h \
sa/tasks/informational.c sa/tasks/informational.h \
sa/tasks/isakmp_cert_pre.c sa/tasks/isakmp_cert_pre.h \
sa/tasks/isakmp_cert_post.c sa/tasks/isakmp_cert_post.h \
sa/tasks/isakmp_delete.c sa/tasks/isakmp_delete.h \
sa/tasks/xauth.c sa/tasks/xauth.h \

4
src/libcharon/sa/ike_sa.c
View File

@ -35,7 +35,6 @@
#include <sa/tasks/ike_auth_lifetime.h>
#include <sa/tasks/ike_config.h>
#include <sa/tasks/ike_cert_pre.h>
#include <sa/tasks/ike_cert_pre_v1.h>
#include <sa/tasks/ike_cert_post.h>
#include <sa/tasks/ike_rekey.h>
#include <sa/tasks/ike_reauth.h>
@ -46,6 +45,7 @@
#include <sa/tasks/child_delete.h>
#include <sa/tasks/child_rekey.h>
#include <sa/tasks/main_mode.h>
#include <sa/tasks/isakmp_cert_pre.h>
#include <sa/tasks/isakmp_cert_post.h>
#include <sa/tasks/quick_mode.h>
#include <sa/tasks/quick_delete.h>
@ -1121,7 +1121,7 @@ METHOD(ike_sa_t, initiate, status_t,
{
task = (task_t*)ike_vendor_v1_create(&this->public, TRUE);
this->task_manager->queue_task(this->task_manager, task);
task = (task_t*)ike_cert_pre_v1_create(&this->public, TRUE);
task = (task_t*)isakmp_cert_pre_create(&this->public, TRUE);
this->task_manager->queue_task(this->task_manager, task);
task = (task_t*)main_mode_create(&this->public, TRUE);
this->task_manager->queue_task(this->task_manager, task);

6
src/libcharon/sa/task_manager_v1.c
View File

@ -26,7 +26,7 @@
#include <sa/tasks/informational.h>
#include <sa/tasks/ike_natd_v1.h>
#include <sa/tasks/ike_vendor_v1.h>
#include <sa/tasks/ike_cert_pre_v1.h>
#include <sa/tasks/isakmp_cert_pre.h>
#include <sa/tasks/isakmp_cert_post.h>
#include <processing/jobs/retransmit_job.h>
#include <processing/jobs/delete_ike_sa_job.h>
@ -300,7 +300,7 @@ METHOD(task_manager_t, initiate, status_t,
{
case IKE_CREATED:
activate_task(this, TASK_VENDOR_V1);
activate_task(this, TASK_IKE_CERT_PRE_V1);
activate_task(this, TASK_ISAKMP_CERT_PRE);
if (activate_task(this, TASK_MAIN_MODE))
{
exchange = ID_PROT;
@ -660,7 +660,7 @@ static status_t process_request(private_task_manager_t *this,
case ID_PROT:
task = (task_t *)ike_vendor_v1_create(this->ike_sa, FALSE);
this->passive_tasks->insert_last(this->passive_tasks, task);
task = (task_t*)ike_cert_pre_v1_create(this->ike_sa, FALSE);
task = (task_t*)isakmp_cert_pre_create(this->ike_sa, FALSE);
this->passive_tasks->insert_last(this->passive_tasks, task);
task = (task_t *)main_mode_create(this->ike_sa, FALSE);
this->passive_tasks->insert_last(this->passive_tasks, task);

44
src/libcharon/sa/tasks/ike_cert_pre_v1.c → src/libcharon/sa/tasks/isakmp_cert_pre.c
View File

@ -13,7 +13,7 @@
* for more details.
*/
#include "ike_cert_pre_v1.h"
#include "isakmp_cert_pre.h"
#include <daemon.h>
#include <sa/ike_sa.h>
@ -23,17 +23,17 @@
#include <credentials/certificates/x509.h>
typedef struct private_ike_cert_pre_v1_t private_ike_cert_pre_v1_t;
typedef struct private_isakmp_cert_pre_t private_isakmp_cert_pre_t;
/**
* Private members of a ike_cert_pre_v1_t task.
* Private members of a isakmp_cert_pre_t task.
*/
struct private_ike_cert_pre_v1_t {
struct private_isakmp_cert_pre_t {
/**
* Public methods and task_t interface.
*/
ike_cert_pre_v1_t public;
isakmp_cert_pre_t public;
/**
* Assigned IKE_SA.
@ -61,7 +61,7 @@ struct private_ike_cert_pre_v1_t {
/**
* Find the CA certificate for a given certreq payload
*/
static certificate_t* find_certificate(private_ike_cert_pre_v1_t *this,
static certificate_t* find_certificate(private_isakmp_cert_pre_t *this,
certreq_payload_t *certreq)
{
identification_t *id;
@ -98,7 +98,7 @@ static certificate_t* find_certificate(private_ike_cert_pre_v1_t *this,
/**
* read certificate requests
*/
static void process_certreqs(private_ike_cert_pre_v1_t *this, message_t *message)
static void process_certreqs(private_isakmp_cert_pre_t *this, message_t *message)
{
enumerator_t *enumerator;
payload_t *payload;
@ -134,7 +134,7 @@ static void process_certreqs(private_ike_cert_pre_v1_t *this, message_t *message
/**
* Import receuved certificates
*/
static void process_certs(private_ike_cert_pre_v1_t *this, message_t *message)
static void process_certs(private_isakmp_cert_pre_t *this, message_t *message)
{
enumerator_t *enumerator;
payload_t *payload;
@ -209,7 +209,7 @@ static void process_certs(private_ike_cert_pre_v1_t *this, message_t *message)
/**
* Add the subject of a CA certificate a message
*/
static void add_certreq(private_ike_cert_pre_v1_t *this, message_t *message,
static void add_certreq(private_isakmp_cert_pre_t *this, message_t *message,
certificate_t *cert)
{
if (cert->get_type(cert) == CERT_X509)
@ -229,7 +229,7 @@ static void add_certreq(private_ike_cert_pre_v1_t *this, message_t *message,
/**
* Add auth_cfg's CA certificates to the certificate request
*/
static void add_certreqs(private_ike_cert_pre_v1_t *this,
static void add_certreqs(private_isakmp_cert_pre_t *this,
auth_cfg_t *auth, message_t *message)
{
enumerator_t *enumerator;
@ -254,7 +254,7 @@ static void add_certreqs(private_ike_cert_pre_v1_t *this,
/**
* Build certificate requests
*/
static void build_certreqs(private_ike_cert_pre_v1_t *this, message_t *message)
static void build_certreqs(private_isakmp_cert_pre_t *this, message_t *message)
{
enumerator_t *enumerator;
ike_cfg_t *ike_cfg;
@ -294,7 +294,7 @@ static void build_certreqs(private_ike_cert_pre_v1_t *this, message_t *message)
/**
* Check if we actually use certificates for authentication
*/
static bool use_certs(private_ike_cert_pre_v1_t *this, message_t *message)
static bool use_certs(private_isakmp_cert_pre_t *this, message_t *message)
{
enumerator_t *enumerator;
payload_t *payload;
@ -333,7 +333,7 @@ static bool use_certs(private_ike_cert_pre_v1_t *this, message_t *message)
}
METHOD(task_t, build_i, status_t,
private_ike_cert_pre_v1_t *this, message_t *message)
private_isakmp_cert_pre_t *this, message_t *message)
{
switch (message->get_exchange_type(message))
{
@ -355,7 +355,7 @@ METHOD(task_t, build_i, status_t,
}
METHOD(task_t, process_r, status_t,
private_ike_cert_pre_v1_t *this, message_t *message)
private_isakmp_cert_pre_t *this, message_t *message)
{
switch (message->get_exchange_type(message))
{
@ -402,7 +402,7 @@ METHOD(task_t, process_r, status_t,
}
METHOD(task_t, build_r, status_t,
private_ike_cert_pre_v1_t *this, message_t *message)
private_isakmp_cert_pre_t *this, message_t *message)
{
switch (message->get_exchange_type(message))
{
@ -439,7 +439,7 @@ METHOD(task_t, build_r, status_t,
}
METHOD(task_t, process_i, status_t,
private_ike_cert_pre_v1_t *this, message_t *message)
private_isakmp_cert_pre_t *this, message_t *message)
{
switch (message->get_exchange_type(message))
{
@ -482,19 +482,19 @@ METHOD(task_t, process_i, status_t,
}
METHOD(task_t, get_type, task_type_t,
private_ike_cert_pre_v1_t *this)
private_isakmp_cert_pre_t *this)
{
return TASK_IKE_CERT_PRE_V1;
return TASK_ISAKMP_CERT_PRE;
}
METHOD(task_t, migrate, void,
private_ike_cert_pre_v1_t *this, ike_sa_t *ike_sa)
private_isakmp_cert_pre_t *this, ike_sa_t *ike_sa)
{
this->ike_sa = ike_sa;
}
METHOD(task_t, destroy, void,
private_ike_cert_pre_v1_t *this)
private_isakmp_cert_pre_t *this)
{
free(this);
}
@ -502,9 +502,9 @@ METHOD(task_t, destroy, void,
/*
* Described in header.
*/
ike_cert_pre_v1_t *ike_cert_pre_v1_create(ike_sa_t *ike_sa, bool initiator)
isakmp_cert_pre_t *isakmp_cert_pre_create(ike_sa_t *ike_sa, bool initiator)
{
private_ike_cert_pre_v1_t *this;
private_isakmp_cert_pre_t *this;
INIT(this,
.public = {

20
src/libcharon/sa/tasks/ike_cert_pre_v1.h → src/libcharon/sa/tasks/isakmp_cert_pre.h
View File

@ -14,23 +14,23 @@
*/
/**
* @defgroup ike_cert_pre_v1 ike_cert_pre_v1
* @defgroup isakmp_cert_pre isakmp_cert_pre
* @{ @ingroup tasks
*/
#ifndef IKE_CERT_PRE_V1_H_
#define IKE_CERT_PRE_V1_H_
#ifndef ISAKMP_CERT_PRE_H_
#define ISAKMP_CERT_PRE_H_
typedef struct ike_cert_pre_v1_t ike_cert_pre_v1_t;
typedef struct isakmp_cert_pre_t isakmp_cert_pre_t;
#include <library.h>
#include <sa/ike_sa.h>
#include <sa/tasks/task.h>
/**
* IKE_CERT_PRE_V1 task, IKEv1 certificate processing before authentication.
* ISAKMP_CERT_PRE task, IKEv1 certificate processing before authentication.
*/
struct ike_cert_pre_v1_t {
struct isakmp_cert_pre_t {
/**
* Implements the task_t interface
@ -39,15 +39,15 @@ struct ike_cert_pre_v1_t {
};
/**
* Create a new IKE_CERT_PRE_V1 task.
* Create a new ISAKMP_CERT_PRE task.
*
* The initiator parameter means the original initiator, not the initiator
* of the certificate request.
*
* @param ike_sa IKE_SA this task works for
* @param initiator TRUE if task is the original initiator
* @return ike_cert_pre_v1 task to handle by the task_manager
* @return isakmp_cert_pre task to handle by the task_manager
*/
ike_cert_pre_v1_t *ike_cert_pre_v1_create(ike_sa_t *ike_sa, bool initiator);
isakmp_cert_pre_t *isakmp_cert_pre_create(ike_sa_t *ike_sa, bool initiator);
#endif /** IIKE_CERT_PRE_V1_H_ @}*/
#endif /** ISAKMP_CERT_PRE_H_ @}*/

2
src/libcharon/sa/tasks/task.c
View File

@ -45,6 +45,6 @@ ENUM(task_type_names, TASK_IKE_INIT, TASK_ISAKMP_CERT_POST,
"QUICK_DELETE",
"VENDOR_V1",
"IKE_NATD_V1",
"IKE_CERT_PRE_V1",
"ISAKMP_CERT_PRE",
"ISAKMP_CERT_POST",
);

2
src/libcharon/sa/tasks/task.h
View File

@ -88,7 +88,7 @@ enum task_type_t {
/** IKEv1 NAT detection */
TASK_IKE_NATD_V1,
/** IKEv1 pre-authentication certificate handling */
TASK_IKE_CERT_PRE_V1,
TASK_ISAKMP_CERT_PRE,
/** IKEv1 post-authentication certificate handling */
TASK_ISAKMP_CERT_POST,
};