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

Migrated sha1_hasher to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-09-28 03:52:43 +02:00
parent 52c4c6a8ff
commit 47edccd17c
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/sha1/sha1_hasher.c
+23 -26
View File
@@ -175,10 +175,8 @@ static void SHA1Final(private_sha1_hasher_t *this, u_int8_t *digest)
} }
} }
/** METHOD(hasher_t, reset, void,
* Implementation of hasher_t.reset. private_sha1_hasher_t *this)
*/
static void reset(private_sha1_hasher_t *this)
{ {
this->state[0] = 0x67452301; this->state[0] = 0x67452301;
this->state[1] = 0xEFCDAB89; this->state[1] = 0xEFCDAB89;
@@ -189,10 +187,8 @@ static void reset(private_sha1_hasher_t *this)
this->count[1] = 0; this->count[1] = 0;
} }
/** METHOD(hasher_t, get_hash, void,
* Implementation of hasher_t.get_hash. private_sha1_hasher_t *this, chunk_t chunk, u_int8_t *buffer)
*/
static void get_hash(private_sha1_hasher_t *this, chunk_t chunk, u_int8_t *buffer)
{ {
SHA1Update(this, chunk.ptr, chunk.len); SHA1Update(this, chunk.ptr, chunk.len);
if (buffer != NULL) if (buffer != NULL)
@@ -202,10 +198,8 @@ static void get_hash(private_sha1_hasher_t *this, chunk_t chunk, u_int8_t *buffe
} }
} }
/** METHOD(hasher_t, allocate_hash, void,
* Implementation of hasher_t.allocate_hash. private_sha1_hasher_t *this, chunk_t chunk, chunk_t *hash)
*/
static void allocate_hash(private_sha1_hasher_t *this, chunk_t chunk, chunk_t *hash)
{ {
SHA1Update(this, chunk.ptr, chunk.len); SHA1Update(this, chunk.ptr, chunk.len);
if (hash != NULL) if (hash != NULL)
@@ -218,18 +212,14 @@ static void allocate_hash(private_sha1_hasher_t *this, chunk_t chunk, chunk_t *h
} }
} }
/** METHOD(hasher_t, get_hash_size, size_t,
* Implementation of hasher_t.get_hash_size. private_sha1_hasher_t *this)
*/
static size_t get_hash_size(private_sha1_hasher_t *this)
{ {
return HASH_SIZE_SHA1; return HASH_SIZE_SHA1;
} }
/** METHOD(hasher_t, destroy, void,
* Implementation of hasher_t.destroy. private_sha1_hasher_t *this)
*/
static void destroy(private_sha1_hasher_t *this)
{ {
free(this); free(this);
} }
@@ -240,16 +230,23 @@ static void destroy(private_sha1_hasher_t *this)
sha1_hasher_t *sha1_hasher_create(hash_algorithm_t algo) sha1_hasher_t *sha1_hasher_create(hash_algorithm_t algo)
{ {
private_sha1_hasher_t *this; private_sha1_hasher_t *this;
if (algo != HASH_SHA1) if (algo != HASH_SHA1)
{ {
return NULL; return NULL;
} }
this = malloc_thing(private_sha1_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);