denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated md4_hasher to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-09-28 03:39:04 +02:00
parent 7c1a28d939
commit 0416bb1c51
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/md4/md4_hasher.c
+21 -27
View File
@@ -268,10 +268,8 @@ static void MD4Final (private_md4_hasher_t *this, u_int8_t digest[16])
/** METHOD(hasher_t, get_hash, void,
* Implementation of hasher_t.get_hash. private_md4_hasher_t *this, chunk_t chunk, u_int8_t *buffer)
*/
static void get_hash(private_md4_hasher_t *this, chunk_t chunk, u_int8_t *buffer)
{ {
MD4Update(this, chunk.ptr, chunk.len); MD4Update(this, chunk.ptr, chunk.len);
if (buffer != NULL) if (buffer != NULL)
@@ -281,11 +279,8 @@ static void get_hash(private_md4_hasher_t *this, chunk_t chunk, u_int8_t *buffer
} }
} }
METHOD(hasher_t, allocate_hash, void,
/** private_md4_hasher_t *this, chunk_t chunk, chunk_t *hash)
* Implementation of hasher_t.allocate_hash.
*/
static void allocate_hash(private_md4_hasher_t *this, chunk_t chunk, chunk_t *hash)
{ {
chunk_t allocated_hash; chunk_t allocated_hash;
@@ -302,18 +297,14 @@ static void allocate_hash(private_md4_hasher_t *this, chunk_t chunk, chunk_t *ha
} }
} }
/** METHOD(hasher_t, get_hash_size, size_t,
* Implementation of hasher_t.get_hash_size. private_md4_hasher_t *this)
*/
static size_t get_hash_size(private_md4_hasher_t *this)
{ {
return HASH_SIZE_MD4; return HASH_SIZE_MD4;
} }
/** METHOD(hasher_t, reset, void,
* Implementation of hasher_t.reset. private_md4_hasher_t *this)
*/
static void reset(private_md4_hasher_t *this)
{ {
this->state[0] = 0x67452301; this->state[0] = 0x67452301;
this->state[1] = 0xefcdab89; this->state[1] = 0xefcdab89;
@@ -323,10 +314,8 @@ static void reset(private_md4_hasher_t *this)
this->count[1] = 0; this->count[1] = 0;
} }
/** METHOD(hasher_t, destroy, void,
* Implementation of hasher_t.destroy. private_md4_hasher_t *this)
*/
static void destroy(private_md4_hasher_t *this)
{ {
free(this); free(this);
} }
@@ -342,13 +331,18 @@ md4_hasher_t *md4_hasher_create(hash_algorithm_t algo)
{ {
return NULL; return NULL;
} }
this = malloc_thing(private_md4_hasher_t);
this->public.hasher_interface.get_hash = (void (*) (hasher_t*, chunk_t, u_int8_t*))get_hash; INIT(this,
this->public.hasher_interface.allocate_hash = (void (*) (hasher_t*, chunk_t, chunk_t*))allocate_hash; .public = {
this->public.hasher_interface.get_hash_size = (size_t (*) (hasher_t*))get_hash_size; .hasher_interface = {
this->public.hasher_interface.reset = (void (*) (hasher_t*))reset; .get_hash = _get_hash,
this->public.hasher_interface.destroy = (void (*) (hasher_t*))destroy; .allocate_hash = _allocate_hash,
.get_hash_size = _get_hash_size,
.reset = _reset,
.destroy = _destroy,
},
},
);
/* initialize */ /* initialize */
reset(this); reset(this);