removed trailing spaces ([[:space:]]+$)
This commit is contained in:
@@ -23,7 +23,7 @@ typedef struct private_hmac_t private_hmac_t;
|
||||
|
||||
/**
|
||||
* Private data of a hmac_t object.
|
||||
*
|
||||
*
|
||||
* The variable names are the same as in the RFC.
|
||||
*/
|
||||
struct private_hmac_t {
|
||||
@@ -31,22 +31,22 @@ struct private_hmac_t {
|
||||
* Public hmac_t interface.
|
||||
*/
|
||||
hmac_t hmac;
|
||||
|
||||
|
||||
/**
|
||||
* Block size, as in RFC.
|
||||
*/
|
||||
u_int8_t b;
|
||||
|
||||
|
||||
/**
|
||||
* Hash function.
|
||||
*/
|
||||
hasher_t *h;
|
||||
|
||||
|
||||
/**
|
||||
* Previously xor'ed key using opad.
|
||||
*/
|
||||
chunk_t opaded_key;
|
||||
|
||||
|
||||
/**
|
||||
* Previously xor'ed key using ipad.
|
||||
*/
|
||||
@@ -58,16 +58,16 @@ struct private_hmac_t {
|
||||
*/
|
||||
static void get_mac(private_hmac_t *this, chunk_t data, u_int8_t *out)
|
||||
{
|
||||
/* H(K XOR opad, H(K XOR ipad, text))
|
||||
*
|
||||
/* H(K XOR opad, H(K XOR ipad, text))
|
||||
*
|
||||
* if out is NULL, we append text to the inner hash.
|
||||
* else, we complete the inner and do the outer.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
u_int8_t buffer[this->h->get_hash_size(this->h)];
|
||||
chunk_t inner;
|
||||
|
||||
|
||||
if (out == NULL)
|
||||
{
|
||||
/* append data to inner */
|
||||
@@ -78,14 +78,14 @@ static void get_mac(private_hmac_t *this, chunk_t data, u_int8_t *out)
|
||||
/* append and do outer hash */
|
||||
inner.ptr = buffer;
|
||||
inner.len = this->h->get_hash_size(this->h);
|
||||
|
||||
|
||||
/* complete inner */
|
||||
this->h->get_hash(this->h, data, buffer);
|
||||
|
||||
|
||||
/* do outer */
|
||||
this->h->get_hash(this->h, this->opaded_key, NULL);
|
||||
this->h->get_hash(this->h, inner, out);
|
||||
|
||||
|
||||
/* reinit for next call */
|
||||
this->h->get_hash(this->h, this->ipaded_key, NULL);
|
||||
}
|
||||
@@ -109,7 +109,7 @@ static void allocate_mac(private_hmac_t *this, chunk_t data, chunk_t *out)
|
||||
this->hmac.get_mac(&(this->hmac), data, out->ptr);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Implementation of hmac_t.get_block_size.
|
||||
*/
|
||||
@@ -125,27 +125,27 @@ static void set_key(private_hmac_t *this, chunk_t key)
|
||||
{
|
||||
int i;
|
||||
u_int8_t buffer[this->b];
|
||||
|
||||
|
||||
memset(buffer, 0, this->b);
|
||||
|
||||
|
||||
if (key.len > this->b)
|
||||
{
|
||||
{
|
||||
/* if key is too long, it will be hashed */
|
||||
this->h->get_hash(this->h, key, buffer);
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
/* if not, just copy it in our pre-padded k */
|
||||
memcpy(buffer, key.ptr, key.len);
|
||||
memcpy(buffer, key.ptr, key.len);
|
||||
}
|
||||
|
||||
|
||||
/* apply ipad and opad to key */
|
||||
for (i = 0; i < this->b; i++)
|
||||
{
|
||||
this->ipaded_key.ptr[i] = buffer[i] ^ 0x36;
|
||||
this->opaded_key.ptr[i] = buffer[i] ^ 0x5C;
|
||||
}
|
||||
|
||||
|
||||
/* begin hashing of inner pad */
|
||||
this->h->reset(this->h);
|
||||
this->h->get_hash(this->h, this->ipaded_key, NULL);
|
||||
@@ -175,7 +175,7 @@ hmac_t *hmac_create(hash_algorithm_t hash_algorithm)
|
||||
this->hmac.get_block_size = (size_t (*)(hmac_t *))get_block_size;
|
||||
this->hmac.set_key = (void (*)(hmac_t *,chunk_t))set_key;
|
||||
this->hmac.destroy = (void (*)(hmac_t *))destroy;
|
||||
|
||||
|
||||
/* set b, according to hasher */
|
||||
switch (hash_algorithm)
|
||||
{
|
||||
@@ -190,15 +190,15 @@ hmac_t *hmac_create(hash_algorithm_t hash_algorithm)
|
||||
break;
|
||||
default:
|
||||
free(this);
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/* build the hasher */
|
||||
this->h = lib->crypto->create_hasher(lib->crypto, hash_algorithm);
|
||||
if (this->h == NULL)
|
||||
{
|
||||
free(this);
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* build ipad and opad */
|
||||
|
||||
@@ -36,46 +36,46 @@ typedef struct hmac_t hmac_t;
|
||||
struct hmac_t {
|
||||
/**
|
||||
* Generate message authentication code.
|
||||
*
|
||||
*
|
||||
* If buffer is NULL, no result is given back. A next call will
|
||||
* append the data to already supplied data. If buffer is not NULL,
|
||||
* append the data to already supplied data. If buffer is not NULL,
|
||||
* the mac of all apended data is calculated, returned and the
|
||||
* state of the hmac_t is reseted.
|
||||
*
|
||||
*
|
||||
* @param data chunk of data to authenticate
|
||||
* @param buffer pointer where the generated bytes will be written
|
||||
*/
|
||||
void (*get_mac) (hmac_t *this, chunk_t data, u_int8_t *buffer);
|
||||
|
||||
|
||||
/**
|
||||
* Generates message authentication code and allocate space for them.
|
||||
*
|
||||
*
|
||||
* If chunk is NULL, no result is given back. A next call will
|
||||
* append the data to already supplied. If chunk is not NULL,
|
||||
* append the data to already supplied. If chunk is not NULL,
|
||||
* the mac of all apended data is calculated, returned and the
|
||||
* state of the hmac_t reset;
|
||||
*
|
||||
*
|
||||
* @param data chunk of data to authenticate
|
||||
* @param chunk chunk which will hold generated bytes
|
||||
*/
|
||||
void (*allocate_mac) (hmac_t *this, chunk_t data, chunk_t *chunk);
|
||||
|
||||
|
||||
/**
|
||||
* Get the block size of this hmac_t object.
|
||||
*
|
||||
*
|
||||
* @return block size in bytes
|
||||
*/
|
||||
size_t (*get_block_size) (hmac_t *this);
|
||||
|
||||
size_t (*get_block_size) (hmac_t *this);
|
||||
|
||||
/**
|
||||
* Set the key for this hmac_t object.
|
||||
*
|
||||
*
|
||||
* Any key length is accepted.
|
||||
*
|
||||
*
|
||||
* @param key key to set
|
||||
*/
|
||||
void (*set_key) (hmac_t *this, chunk_t key);
|
||||
|
||||
|
||||
/**
|
||||
* Destroys a hmac_t object.
|
||||
*/
|
||||
@@ -84,7 +84,7 @@ struct hmac_t {
|
||||
|
||||
/**
|
||||
* Creates a new hmac_t object.
|
||||
*
|
||||
*
|
||||
* @param hash_algorithm hash algorithm to use
|
||||
* @return hmac_t object, NULL if not supported
|
||||
*/
|
||||
|
||||
@@ -50,35 +50,35 @@ static void destroy(private_hmac_plugin_t *this)
|
||||
plugin_t *plugin_create()
|
||||
{
|
||||
private_hmac_plugin_t *this = malloc_thing(private_hmac_plugin_t);
|
||||
|
||||
|
||||
this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
|
||||
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_256,
|
||||
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_256,
|
||||
(prf_constructor_t)hmac_prf_create);
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA1,
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA1,
|
||||
(prf_constructor_t)hmac_prf_create);
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_MD5,
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_MD5,
|
||||
(prf_constructor_t)hmac_prf_create);
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_384,
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_384,
|
||||
(prf_constructor_t)hmac_prf_create);
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_512,
|
||||
lib->crypto->add_prf(lib->crypto, PRF_HMAC_SHA2_512,
|
||||
(prf_constructor_t)hmac_prf_create);
|
||||
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_96,
|
||||
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_96,
|
||||
(signer_constructor_t)hmac_signer_create);
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_128,
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_128,
|
||||
(signer_constructor_t)hmac_signer_create);
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_160,
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA1_160,
|
||||
(signer_constructor_t)hmac_signer_create);
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_128,
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_256_128,
|
||||
(signer_constructor_t)hmac_signer_create);
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_96,
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_96,
|
||||
(signer_constructor_t)hmac_signer_create);
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_128,
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_MD5_128,
|
||||
(signer_constructor_t)hmac_signer_create);
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_384_192,
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_384_192,
|
||||
(signer_constructor_t)hmac_signer_create);
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_512_256,
|
||||
lib->crypto->add_signer(lib->crypto, AUTH_HMAC_SHA2_512_256,
|
||||
(signer_constructor_t)hmac_signer_create);
|
||||
|
||||
return &this->public.plugin;
|
||||
|
||||
@@ -28,8 +28,8 @@ struct private_hmac_prf_t {
|
||||
/**
|
||||
* Public hmac_prf_t interface.
|
||||
*/
|
||||
hmac_prf_t public;
|
||||
|
||||
hmac_prf_t public;
|
||||
|
||||
/**
|
||||
* Hmac to use for generation.
|
||||
*/
|
||||
@@ -93,7 +93,7 @@ hmac_prf_t *hmac_prf_create(pseudo_random_function_t algo)
|
||||
{
|
||||
private_hmac_prf_t *this;
|
||||
hash_algorithm_t hash;
|
||||
|
||||
|
||||
switch (algo)
|
||||
{
|
||||
case PRF_HMAC_SHA1:
|
||||
@@ -114,22 +114,22 @@ hmac_prf_t *hmac_prf_create(pseudo_random_function_t algo)
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
this = malloc_thing(private_hmac_prf_t);
|
||||
this->hmac = hmac_create(hash);
|
||||
if (this->hmac == NULL)
|
||||
{
|
||||
free(this);
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
this->public.prf_interface.get_bytes = (void (*) (prf_t *,chunk_t,u_int8_t*))get_bytes;
|
||||
this->public.prf_interface.allocate_bytes = (void (*) (prf_t*,chunk_t,chunk_t*))allocate_bytes;
|
||||
this->public.prf_interface.get_block_size = (size_t (*) (prf_t*))get_block_size;
|
||||
this->public.prf_interface.get_key_size = (size_t (*) (prf_t*))get_key_size;
|
||||
this->public.prf_interface.set_key = (void (*) (prf_t *,chunk_t))set_key;
|
||||
this->public.prf_interface.destroy = (void (*) (prf_t *))destroy;
|
||||
|
||||
|
||||
return &(this->public);
|
||||
}
|
||||
|
||||
|
||||
@@ -28,12 +28,12 @@ typedef struct hmac_prf_t hmac_prf_t;
|
||||
|
||||
/**
|
||||
* Implementation of prf_t interface using the HMAC algorithm.
|
||||
*
|
||||
*
|
||||
* This simply wraps a hmac_t in a prf_t. More a question of
|
||||
* interface matching.
|
||||
*/
|
||||
struct hmac_prf_t {
|
||||
|
||||
|
||||
/**
|
||||
* Generic prf_t interface for this hmac_prf_t class.
|
||||
*/
|
||||
@@ -42,7 +42,7 @@ struct hmac_prf_t {
|
||||
|
||||
/**
|
||||
* Creates a new hmac_prf_t object.
|
||||
*
|
||||
*
|
||||
* @param algo algorithm to implement
|
||||
* @return hmac_prf_t object, NULL if hash not supported
|
||||
*/
|
||||
|
||||
@@ -29,12 +29,12 @@ struct private_hmac_signer_t {
|
||||
* Public interface of hmac_signer_t.
|
||||
*/
|
||||
hmac_signer_t public;
|
||||
|
||||
|
||||
/**
|
||||
* Assigned hmac function.
|
||||
*/
|
||||
hmac_t *hmac;
|
||||
|
||||
|
||||
/**
|
||||
* Block size (truncation of HMAC Hash)
|
||||
*/
|
||||
@@ -54,7 +54,7 @@ static void get_signature(private_hmac_signer_t *this,
|
||||
else
|
||||
{
|
||||
u_int8_t mac[this->hmac->get_block_size(this->hmac)];
|
||||
|
||||
|
||||
this->hmac->get_mac(this->hmac, data, mac);
|
||||
memcpy(buffer, mac, this->block_size);
|
||||
}
|
||||
@@ -73,12 +73,12 @@ static void allocate_signature (private_hmac_signer_t *this,
|
||||
else
|
||||
{
|
||||
u_int8_t mac[this->hmac->get_block_size(this->hmac)];
|
||||
|
||||
|
||||
this->hmac->get_mac(this->hmac, data, mac);
|
||||
|
||||
chunk->ptr = malloc(this->block_size);
|
||||
chunk->len = this->block_size;
|
||||
|
||||
|
||||
memcpy(chunk->ptr, mac, this->block_size);
|
||||
}
|
||||
}
|
||||
@@ -90,9 +90,9 @@ static bool verify_signature(private_hmac_signer_t *this,
|
||||
chunk_t data, chunk_t signature)
|
||||
{
|
||||
u_int8_t mac[this->hmac->get_block_size(this->hmac)];
|
||||
|
||||
|
||||
this->hmac->get_mac(this->hmac, data, mac);
|
||||
|
||||
|
||||
if (signature.len != this->block_size)
|
||||
{
|
||||
return FALSE;
|
||||
@@ -142,7 +142,7 @@ hmac_signer_t *hmac_signer_create(integrity_algorithm_t algo)
|
||||
private_hmac_signer_t *this;
|
||||
size_t trunc;
|
||||
hash_algorithm_t hash;
|
||||
|
||||
|
||||
switch (algo)
|
||||
{
|
||||
case AUTH_HMAC_SHA1_96:
|
||||
@@ -180,7 +180,7 @@ hmac_signer_t *hmac_signer_create(integrity_algorithm_t algo)
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
this = malloc_thing(private_hmac_signer_t);
|
||||
this->hmac = hmac_create(hash);
|
||||
if (this->hmac == NULL)
|
||||
@@ -190,7 +190,7 @@ hmac_signer_t *hmac_signer_create(integrity_algorithm_t algo)
|
||||
}
|
||||
/* prevent invalid truncation */
|
||||
this->block_size = min(trunc, this->hmac->get_block_size(this->hmac));
|
||||
|
||||
|
||||
/* interface functions */
|
||||
this->public.signer_interface.get_signature = (void (*) (signer_t*, chunk_t, u_int8_t*))get_signature;
|
||||
this->public.signer_interface.allocate_signature = (void (*) (signer_t*, chunk_t, chunk_t*))allocate_signature;
|
||||
@@ -199,7 +199,7 @@ hmac_signer_t *hmac_signer_create(integrity_algorithm_t algo)
|
||||
this->public.signer_interface.get_block_size = (size_t (*) (signer_t*))get_block_size;
|
||||
this->public.signer_interface.set_key = (void (*) (signer_t*,chunk_t))set_key;
|
||||
this->public.signer_interface.destroy = (void (*) (signer_t*))destroy;
|
||||
|
||||
|
||||
return &(this->public);
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ typedef struct hmac_signer_t hmac_signer_t;
|
||||
* HMAC uses a standard hash function implemented in a hasher_t to build a MAC.
|
||||
*/
|
||||
struct hmac_signer_t {
|
||||
|
||||
|
||||
/**
|
||||
* generic signer_t interface for this signer
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user