Migrated psk/pubkey_authenticators to INIT/METHOD macros

diff --git a/src/libcharon/sa/authenticators/psk_authenticator.c b/src/libcharon/sa/authenticators/psk_authenticator.c
index e69f30dcf304508a1900ca45ad7d81cef0f53c35..54ab533e6fa7844ff7cbac4d2987d004bd069d7f 100644 (file)
--- a/src/libcharon/sa/authenticators/psk_authenticator.c
+++ b/src/libcharon/sa/authenticators/psk_authenticator.c
@@ -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;
 }
 

diff --git a/src/libcharon/sa/authenticators/pubkey_authenticator.c b/src/libcharon/sa/authenticators/pubkey_authenticator.c
index 54b4338bb54a5f36676fc4d1718c1af948510465..1d01abf504b4b5be01aa4e8a9d66a43db8593f03 100644 (file)
--- a/src/libcharon/sa/authenticators/pubkey_authenticator.c
+++ b/src/libcharon/sa/authenticators/pubkey_authenticator.c
@@ -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;
 }

diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c
index b868d538d7d057e3378a43f191c53e33e065883b..2ab061a746a79c8ed75b413b10b0e762581ca64d 100644 (file)
--- a/src/libstrongswan/utils.c
+++ b/src/libstrongswan/utils.c
@@ -246,6 +246,14 @@ bool return_false()
        return FALSE;
 }
 
+/**
+ * returns FAILED
+ */
+status_t return_failed()
+{
+       return FAILED;
+}
+
 /**
  * nop operation
  */

diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index 35d3bebd152d51f447a64df9b204633f22b3b925..c41e1d6b3dd6fb82f63582ac4aa310282f92b120 100644 (file)
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -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.
  *