Migrated blowfish plugin to INIT/METHOD macros

diff --git a/src/libstrongswan/plugins/blowfish/blowfish_crypter.c b/src/libstrongswan/plugins/blowfish/blowfish_crypter.c
index fb856ed37be98b95b44977245b704c03dbfcbbc5..b23a7bab11669b22043e8fc17e42de177495ba2a 100644 (file)
--- a/src/libstrongswan/plugins/blowfish/blowfish_crypter.c
+++ b/src/libstrongswan/plugins/blowfish/blowfish_crypter.c
@@ -68,8 +68,6 @@ typedef struct private_blowfish_crypter_t private_blowfish_crypter_t;
 
 /**
  * Class implementing the Blowfish symmetric encryption algorithm.
- *
- * @ingroup crypters
  */
 struct private_blowfish_crypter_t {
 
@@ -89,11 +87,9 @@ struct private_blowfish_crypter_t {
        u_int32_t key_size;
 };
 
-/**
- * Implementation of crypter_t.decrypt.
- */
-static void decrypt(private_blowfish_crypter_t *this, chunk_t data, chunk_t iv,
-                                       chunk_t *decrypted)
+METHOD(crypter_t, decrypt, void,
+       private_blowfish_crypter_t *this, chunk_t data, chunk_t iv,
+       chunk_t *decrypted)
 {
        u_int8_t *in, *out;
 
@@ -114,11 +110,9 @@ static void decrypt(private_blowfish_crypter_t *this, chunk_t data, chunk_t iv,
        free(iv.ptr);
 }
 
-/**
- * Implementation of crypter_t.decrypt.
- */
-static void encrypt (private_blowfish_crypter_t *this, chunk_t data, chunk_t iv,
-                                        chunk_t *encrypted)
+METHOD(crypter_t, encrypt, void,
+       private_blowfish_crypter_t *this, chunk_t data, chunk_t iv,
+       chunk_t *encrypted)
 {
        u_int8_t *in, *out;
 
@@ -139,34 +133,26 @@ static void encrypt (private_blowfish_crypter_t *this, chunk_t data, chunk_t iv,
        free(iv.ptr);
 }
 
-/**
- * Implementation of crypter_t.get_block_size.
- */
-static size_t get_block_size (private_blowfish_crypter_t *this)
+METHOD(crypter_t, get_block_size, size_t,
+       private_blowfish_crypter_t *this)
 {
        return BLOWFISH_BLOCK_SIZE;
 }
 
-/**
- * Implementation of crypter_t.get_key_size.
- */
-static size_t get_key_size (private_blowfish_crypter_t *this)
+METHOD(crypter_t, get_key_size, size_t,
+       private_blowfish_crypter_t *this)
 {
        return this->key_size;
 }
 
-/**
- * Implementation of crypter_t.set_key.
- */
-static void set_key (private_blowfish_crypter_t *this, chunk_t key)
+METHOD(crypter_t, set_key, void,
+       private_blowfish_crypter_t *this, chunk_t key)
 {
        BF_set_key(&this->schedule, key.len , key.ptr);
 }
 
-/**
- * Implementation of crypter_t.destroy and blowfish_crypter_t.destroy.
- */
-static void destroy (private_blowfish_crypter_t *this)
+METHOD(crypter_t, destroy, void,
+       private_blowfish_crypter_t *this)
 {
        free(this);
 }
@@ -183,15 +169,17 @@ blowfish_crypter_t *blowfish_crypter_create(encryption_algorithm_t algo, size_t
                return NULL;
        }
 
-       this = malloc_thing(private_blowfish_crypter_t);
-
-       this->key_size = key_size;
-       this->public.crypter_interface.encrypt = (void (*) (crypter_t *, chunk_t,chunk_t, chunk_t *)) encrypt;
-       this->public.crypter_interface.decrypt = (void (*) (crypter_t *, chunk_t , chunk_t, chunk_t *)) decrypt;
-       this->public.crypter_interface.get_block_size = (size_t (*) (crypter_t *)) get_block_size;
-       this->public.crypter_interface.get_key_size = (size_t (*) (crypter_t *)) get_key_size;
-       this->public.crypter_interface.set_key = (void (*) (crypter_t *,chunk_t)) set_key;
-       this->public.crypter_interface.destroy = (void (*) (crypter_t *)) destroy;
-
-       return &(this->public);
+       INIT(this,
+               .public.crypter = {
+                       .encrypt = _encrypt,
+                       .decrypt = _decrypt,
+                       .get_block_size = _get_block_size,
+                       .get_key_size = _get_key_size,
+                       .set_key = _set_key,
+                       .destroy = _destroy,
+               },
+               .key_size = key_size,
+       );
+
+       return &this->public;
 }

diff --git a/src/libstrongswan/plugins/blowfish/blowfish_crypter.h b/src/libstrongswan/plugins/blowfish/blowfish_crypter.h
index 71cc09cd0e818efa53b16da3ccc087f20f290d3d..70dcae66e4041d78b6f0e0542efd1c0ac172ac11 100644 (file)
--- a/src/libstrongswan/plugins/blowfish/blowfish_crypter.h
+++ b/src/libstrongswan/plugins/blowfish/blowfish_crypter.h
@@ -32,9 +32,9 @@ typedef struct blowfish_crypter_t blowfish_crypter_t;
 struct blowfish_crypter_t {
 
        /**
-        * The crypter_t interface.
+        * Implements crypter_t interface.
         */
-       crypter_t crypter_interface;
+       crypter_t crypter;
 };
 
 /**

diff --git a/src/libstrongswan/plugins/blowfish/blowfish_plugin.c b/src/libstrongswan/plugins/blowfish/blowfish_plugin.c
index f9fb605b351a6b68f5171879344de7c72179839f..b4b92c8c5c441d8db6e76ec32ea24a8053214468 100644 (file)
--- a/src/libstrongswan/plugins/blowfish/blowfish_plugin.c
+++ b/src/libstrongswan/plugins/blowfish/blowfish_plugin.c
@@ -32,10 +32,8 @@ struct private_blowfish_plugin_t {
        blowfish_plugin_t public;
 };
 
-/**
- * Implementation of blowfish_plugin_t.destroy
- */
-static void destroy(private_blowfish_plugin_t *this)
+METHOD(plugin_t, destroy, void,
+       private_blowfish_plugin_t *this)
 {
        lib->crypto->remove_crypter(lib->crypto,
                                                                (crypter_constructor_t)blowfish_crypter_create);
@@ -47,9 +45,11 @@ static void destroy(private_blowfish_plugin_t *this)
  */
 plugin_t *blowfish_plugin_create()
 {
-       private_blowfish_plugin_t *this = malloc_thing(private_blowfish_plugin_t);
+       private_blowfish_plugin_t *this;
 
-       this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
+       INIT(this,
+               .public.plugin.destroy = _destroy,
+       );
 
        lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH,
                                                         (crypter_constructor_t)blowfish_crypter_create);