Migrated psk/pubkey_authenticators to INIT/METHOD macros
[strongswan.git] / src / libcharon / sa / authenticators / pubkey_authenticator.c
index 54b4338..1d01abf 100644 (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;
 }