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

Migrated psk/pubkey_authenticators to INIT/METHOD macros

This commit is contained in:
Martin Willi 2010-11-25 11:13:04 +01:00
parent b5bbc9506c
commit 502edf425f
4 changed files with 81 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/libcharon/sa/authenticators/psk_authenticator.c
View File

@ -47,10 +47,8 @@ struct private_psk_authenticator_t {
chunk_t ike_sa_init;
};
/*
* Implementation of authenticator_t.build for builder
*/
static status_t build(private_psk_authenticator_t *this, message_t *message)
METHOD(authenticator_t, build, status_t,
private_psk_authenticator_t *this, message_t *message)
{
identification_t *my_id, *other_id;
auth_payload_t *auth_payload;
@ -82,10 +80,8 @@ static status_t build(private_psk_authenticator_t *this, message_t *message)
return SUCCESS;
}
/**
* Implementation of authenticator_t.process for verifier
*/
static status_t process(private_psk_authenticator_t *this, message_t *message)
METHOD(authenticator_t, process, status_t,
private_psk_authenticator_t *this, message_t *message)
{
chunk_t auth_data, recv_auth_data;
identification_t *my_id, *other_id;
@ -141,19 +137,8 @@ static status_t process(private_psk_authenticator_t *this, message_t *message)
return SUCCESS;
}
/**
* Implementation of authenticator_t.process for builder
* Implementation of authenticator_t.build for verifier
*/
static status_t return_failed()
{
return FAILED;
}
/**
* Implementation of authenticator_t.destroy.
*/
static void destroy(private_psk_authenticator_t *this)
METHOD(authenticator_t, destroy, void,
private_psk_authenticator_t *this)
{
free(this);
}
@ -164,17 +149,21 @@ static void destroy(private_psk_authenticator_t *this)
psk_authenticator_t *psk_authenticator_create_builder(ike_sa_t *ike_sa,
chunk_t received_nonce, chunk_t sent_init)
{
private_psk_authenticator_t *this = malloc_thing(private_psk_authenticator_t);
this->public.authenticator.build = (status_t(*)(authenticator_t*, message_t *message))build;
this->public.authenticator.process = (status_t(*)(authenticator_t*, message_t *message))return_failed;
this->public.authenticator.is_mutual = (bool(*)(authenticator_t*))return_false;
this->public.authenticator.destroy = (void(*)(authenticator_t*))destroy;
this->ike_sa = ike_sa;
this->ike_sa_init = sent_init;
this->nonce = received_nonce;
private_psk_authenticator_t *this;
INIT(this,
.public = {
.authenticator = {
.build = _build,
.process = (void*)return_failed,
.is_mutual = (void*)return_false,
.destroy = _destroy,
},
}.
.ike_sa = ike_sa,
.ike_sa_init = sent_init,
.nonce = received_nonce,
);
return &this->public;
}
@ -184,17 +173,21 @@ psk_authenticator_t *psk_authenticator_create_builder(ike_sa_t *ike_sa,
psk_authenticator_t *psk_authenticator_create_verifier(ike_sa_t *ike_sa,
chunk_t sent_nonce, chunk_t received_init)
{
private_psk_authenticator_t *this = malloc_thing(private_psk_authenticator_t);
this->public.authenticator.build = (status_t(*)(authenticator_t*, message_t *messageh))return_failed;
this->public.authenticator.process = (status_t(*)(authenticator_t*, message_t *message))process;
this->public.authenticator.is_mutual = (bool(*)(authenticator_t*))return_false;
this->public.authenticator.destroy = (void(*)(authenticator_t*))destroy;
this->ike_sa = ike_sa;
this->ike_sa_init = received_init;
this->nonce = sent_nonce;
private_psk_authenticator_t *this;
INIT(this,
.public = {
.authenticator = {
.build = (void*)return_failed,
.process = _process,
.is_mutual = (void*)return_false,
.destroy = _destroy,
},
},
.ike_sa = ike_sa,
.ike_sa_init = received_init,
.nonce = sent_nonce,
);
return &this->public;
}

75
src/libcharon/sa/authenticators/pubkey_authenticator.c
View File

@ -48,10 +48,8 @@ struct private_pubkey_authenticator_t {
chunk_t ike_sa_init;
};
/**
* Implementation of authenticator_t.build for builder
*/
static status_t build(private_pubkey_authenticator_t *this, message_t *message)
METHOD(authenticator_t, build, status_t,
private_pubkey_authenticator_t *this, message_t *message)
{
chunk_t octets, auth_data;
status_t status = FAILED;
@ -128,10 +126,8 @@ static status_t build(private_pubkey_authenticator_t *this, message_t *message)
return status;
}
/**
* Implementation of authenticator_t.process for verifier
*/
static status_t process(private_pubkey_authenticator_t *this, message_t *message)
METHOD(authenticator_t, process, status_t,
private_pubkey_authenticator_t *this, message_t *message)
{
public_key_t *public;
auth_method_t auth_method;
@ -206,19 +202,8 @@ static status_t process(private_pubkey_authenticator_t *this, message_t *message
return status;
}
/**
* Implementation of authenticator_t.process for builder
* Implementation of authenticator_t.build for verifier
*/
static status_t return_failed()
{
return FAILED;
}
/**
* Implementation of authenticator_t.destroy.
*/
static void destroy(private_pubkey_authenticator_t *this)
METHOD(authenticator_t, destroy, void,
private_pubkey_authenticator_t *this)
{
free(this);
}
@ -229,17 +214,21 @@ static void destroy(private_pubkey_authenticator_t *this)
pubkey_authenticator_t *pubkey_authenticator_create_builder(ike_sa_t *ike_sa,
chunk_t received_nonce, chunk_t sent_init)
{
private_pubkey_authenticator_t *this = malloc_thing(private_pubkey_authenticator_t);
this->public.authenticator.build = (status_t(*)(authenticator_t*, message_t *message))build;
this->public.authenticator.process = (status_t(*)(authenticator_t*, message_t *message))return_failed;
this->public.authenticator.is_mutual = (bool(*)(authenticator_t*))return_false;
this->public.authenticator.destroy = (void(*)(authenticator_t*))destroy;
this->ike_sa = ike_sa;
this->ike_sa_init = sent_init;
this->nonce = received_nonce;
private_pubkey_authenticator_t *this;
INIT(this,
.public = {
.authenticator = {
.build = _build,
.process = (void*)return_failed,
.is_mutual = (void*)return_false,
.destroy = _destroy,
},
},
.ike_sa = ike_sa,
.ike_sa_init = sent_init,
.nonce = received_nonce,
);
return &this->public;
}
@ -249,16 +238,20 @@ pubkey_authenticator_t *pubkey_authenticator_create_builder(ike_sa_t *ike_sa,
pubkey_authenticator_t *pubkey_authenticator_create_verifier(ike_sa_t *ike_sa,
chunk_t sent_nonce, chunk_t received_init)
{
private_pubkey_authenticator_t *this = malloc_thing(private_pubkey_authenticator_t);
this->public.authenticator.build = (status_t(*)(authenticator_t*, message_t *message))return_failed;
this->public.authenticator.process = (status_t(*)(authenticator_t*, message_t *message))process;
this->public.authenticator.is_mutual = (bool(*)(authenticator_t*))return_false;
this->public.authenticator.destroy = (void(*)(authenticator_t*))destroy;
this->ike_sa = ike_sa;
this->ike_sa_init = received_init;
this->nonce = sent_nonce;
private_pubkey_authenticator_t *this;
INIT(this,
.public = {
.authenticator = {
.build = (void*)return_failed,
.process = _process,
.is_mutual = (void*)return_false,
.destroy = _destroy,
},
},
.ike_sa = ike_sa,
.ike_sa_init = received_init,
.nonce = sent_nonce,
);
return &this->public;
}

8
src/libstrongswan/utils.c
View File

@ -246,6 +246,14 @@ bool return_false()
return FALSE;
}
/**
* returns FAILED
*/
status_t return_failed()
{
return FAILED;
}
/**
* nop operation
*/

5
src/libstrongswan/utils.h
View File

@ -381,6 +381,11 @@ bool return_true();
*/
bool return_false();
/**
* returns FAILED
*/
status_t return_failed();
/**
* Write a 16-bit host order value in network order to an unaligned address.
*