- implemented md5 hasher

- tested
This commit is contained in:
Martin Willi 2005-11-22 14:46:35 +00:00
parent 6c105d1c89
commit bfa4b2180b
6 changed files with 636 additions and 34 deletions

View File

@ -0,0 +1,93 @@
/**
* @file hasher_md5_test.h
*
* @brief Tests the md5 hasher
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include <string.h>
#include "hasher_md5_test.h"
#include "../utils/allocator.h"
/*
* described in Header-File
*/
void test_hasher_md5(tester_t *tester)
{
/*
* Test vectors from RFC1321:
* MD5 ("") = d41d8cd98f00b204e9800998ecf8427e
* MD5 ("a") = 0cc175b9c0f1b6a831c399e269772661
* MD5 ("abc") = 900150983cd24fb0d6963f7d28e17f72
* MD5 ("message digest") = f96b697d7cb7938d525a2f31aaf161d0
* MD5 ("abcdefghijklmnopqrstuvwxyz") = c3fcd3d76192e4007dfb496cca67e13b
*
* currently testing "", "abc", "abcdefghijklmnopqrstuvwxyz"
*/
hasher_t *hasher = hasher_create(HASH_MD5);
u_int8_t hash_buffer[16];
chunk_t empty, abc, abcd, hash_chunk;
u_int8_t hash_empty[] = {
0xd4,0x1d,0x8c,0xd9,
0x8f,0x00,0xb2,0x04,
0xe9,0x80,0x09,0x98,
0xec,0xf8,0x42,0x7e
};
u_int8_t hash_abc[] = {
0x90,0x01,0x50,0x98,
0x3c,0xd2,0x4f,0xb0,
0xd6,0x96,0x3f,0x7d,
0x28,0xe1,0x7f,0x72
};
u_int8_t hash_abcd[] = {
0xc3,0xfc,0xd3,0xd7,
0x61,0x92,0xe4,0x00,
0x7d,0xfb,0x49,0x6c,
0xca,0x67,0xe1,0x3b
};
empty.ptr = "";
empty.len = 0;
abc.ptr = "abc";
abc.len = 3;
abcd.ptr = "abcdefghijklmnopqrstuvwxyz";
abcd.len = strlen(abcd.ptr);
tester->assert_true(tester, hasher->get_block_size(hasher) == 16, "block size");
/* simple hashing, using empty */
hasher->get_hash(hasher, empty, hash_buffer);
tester->assert_false(tester, memcmp(hash_buffer, hash_empty, 16), "hash for empty");
/* simple hashing, using "abc" */
hasher->get_hash(hasher, abc, hash_buffer);
tester->assert_false(tester, memcmp(hash_buffer, hash_abc, 16), "hash for abc");
/* with allocation, using "abcdb..." */
hasher->reset(hasher);
hasher->allocate_hash(hasher, abcd, &hash_chunk);
tester->assert_true(tester, hash_chunk.len == 16, "hash len");
tester->assert_false(tester, memcmp(hash_chunk.ptr, hash_abcd, hash_chunk.len), "hash for abcd...");
allocator_free(hash_chunk.ptr);
}

View File

@ -0,0 +1,37 @@
/**
* @file hasher_md5_test.h
*
* @brief Tests the md5 hasher
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#ifndef HASHER_MD5_TEST_H_
#define HASHER_MD5_TEST_H_
#include "../transforms/hashers/hasher.h"
#include "../transforms/hashers/hasher_md5.h"
#include "../utils/tester.h"
/**
* @brief Test function used to test the md5-hasher functionality
*
* @param tester associated tester object
*/
void test_hasher_md5(tester_t *tester);
#endif /*HASHER_MD5_TEST_H_*/

View File

@ -49,6 +49,7 @@
#include "packet_test.h"
#include "diffie_hellman_test.h"
#include "hasher_sha1_test.h"
#include "hasher_md5_test.h"
#include "hmac_test.h"
#include "prf_plus_test.h"
@ -180,10 +181,15 @@ test_t diffie_hellman_test = {test_diffie_hellman,"Diffie Hellman"};
*/
test_t hasher_sha1_test = {test_hasher_sha1,"SHA1 hasher"};
/**
* Test for md5 hasher
*/
test_t hasher_md5_test = {test_hasher_md5,"MD5 hasher"};
/**
* Test for hmac
*/
test_t hmac_test1 = {test_hmac_sha1, "HMAC-SHA1"};
test_t hmac_test1 = {test_hmac_sha1, "HMAC using SHA1"};
/**
* Test for prf_plus
@ -235,37 +241,40 @@ logger_manager_t *global_logger_manager;
FILE * test_output = stderr;
test_t *all_tests[] ={
&linked_list_test,
&linked_list_iterator_test,
&linked_list_insert_and_remove_test,
&thread_pool_test,
&job_queue_test1,
&event_queue_test,
&send_queue_test,
&scheduler_test,
&socket_test,
&sender_test,
&receiver_test,
&ike_sa_id_test,
&ike_sa_test,
&generator_test1,
&generator_test2,
&parser_test1,
&parser_test2,
&parser_test3,
&parser_test4,
&parser_test5,
&generator_test3,
&generator_test4,
&generator_test5,
&generator_test6,
&generator_test7,
&generator_test8,
&ike_sa_manager_test,
&packet_test,
&diffie_hellman_test,
&hasher_sha1_test,
NULL
&linked_list_test,
&linked_list_iterator_test,
&linked_list_insert_and_remove_test,
&thread_pool_test,
&job_queue_test1,
&event_queue_test,
&send_queue_test,
&scheduler_test,
&socket_test,
&sender_test,
&receiver_test,
&ike_sa_id_test,
//&ike_sa_test,
&generator_test1,
&generator_test2,
&parser_test1,
&parser_test2,
&parser_test3,
&parser_test4,
&parser_test5,
&generator_test3,
&generator_test4,
&generator_test5,
&generator_test6,
&generator_test7,
&generator_test8,
//&ike_sa_manager_test,
&packet_test,
&diffie_hellman_test,
&hasher_sha1_test,
&hasher_md5_test,
&hmac_test1,
&prf_plus_test,
NULL
};
global_logger_manager = logger_manager_create(FULL);
@ -282,8 +291,8 @@ logger_manager_t *global_logger_manager;
tester_t *tester = tester_create(test_output, FALSE);
//tester->perform_tests(tester,all_tests);
tester->perform_test(tester,&prf_plus_test);
tester->perform_tests(tester,all_tests);
//tester->perform_test(tester,&hasher_md5_test);

View File

@ -24,6 +24,7 @@
#include "hasher.h"
#include "hasher_sha1.h"
#include "hasher_md5.h"
@ -39,6 +40,9 @@ hasher_t *hasher_create(hash_algorithm_t hash_algorithm)
return (hasher_t*)hasher_sha1_create();
}
case HASH_MD5:
{
return (hasher_t*)hasher_md5_create();
}
default:
return NULL;
}

View File

@ -0,0 +1,406 @@
/**
* @file hasher_md5.c
*
* @brief Implementation of hasher_t interface using the
* md5 algorithm.
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Hochschule fuer Technik Rapperswil
* Copyright (C) 1991-1992, RSA Data Security, Inc. Created 1991.
* All rights reserved.
*
* Derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm.
* Ported to fulfill hasher_t interface.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "hasher_md5.h"
#include "../../definitions.h"
#include "../../utils/allocator.h"
#define BLOCK_SIZE_MD5 16
/* Constants for MD5Transform routine. */
#define S11 7
#define S12 12
#define S13 17
#define S14 22
#define S21 5
#define S22 9
#define S23 14
#define S24 20
#define S31 4
#define S32 11
#define S33 16
#define S34 23
#define S41 6
#define S42 10
#define S43 15
#define S44 21
static u_int8_t PADDING[64] = {
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
/*
* ugly macro stuff
*/
/* F, G, H and I are basic MD5 functions.
*/
#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
#define H(x, y, z) ((x) ^ (y) ^ (z))
#define I(x, y, z) ((y) ^ ((x) | (~z)))
/* ROTATE_LEFT rotates x left n bits.
*/
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
Rotation is separate from addition to prevent recomputation.
*/
#define FF(a, b, c, d, x, s, ac) { \
(a) += F ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define GG(a, b, c, d, x, s, ac) { \
(a) += G ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define HH(a, b, c, d, x, s, ac) { \
(a) += H ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define II(a, b, c, d, x, s, ac) { \
(a) += I ((b), (c), (d)) + (x) + (u_int32_t)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
/**
* private data structure with hasing context
*/
typedef struct private_hasher_md5_s private_hasher_md5_t;
struct private_hasher_md5_s {
/**
* public interface for this hasher
*/
hasher_md5_t public;
/*
* state of the hasher
*/
u_int32_t state[5];
u_int32_t count[2];
u_int8_t buffer[64];
};
#if BYTE_ORDER != LITTLE_ENDIAN
/* Encodes input (u_int32_t) into output (u_int8_t). Assumes len is
* a multiple of 4.
*/
static void Encode (u_int8_t *output, u_int32_t *input, size_t *len)
{
size_t i, j;
for (i = 0, j = 0; j < len; i++, j += 4)
{
output[j] = (u_int8_t)(input[i] & 0xff);
output[j+1] = (u_int8_t)((input[i] >> 8) & 0xff);
output[j+2] = (u_int8_t)((input[i] >> 16) & 0xff);
output[j+3] = (u_int8_t)((input[i] >> 24) & 0xff);
}
}
/* Decodes input (u_int8_t) into output (u_int32_t). Assumes len is
* a multiple of 4.
*/
static void Decode(u_int32_t *output, u_int8_t *input, size_t len)
{
size_t i, j;
for (i = 0, j = 0; j < len; i++, j += 4)
{
output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) |
(((u_int32_t)input[j+2]) << 16) | (((u_int32_t)input[j+3]) << 24);
}
}
#elif BYTE_ORDER == LITTLE_ENDIAN
#define Encode memcpy
#define Decode memcpy
#endif
/* MD5 basic transformation. Transforms state based on block.
*/
static void MD5Transform(u_int32_t state[4], u_int8_t block[64])
{
u_int32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
Decode(x, block, 64);
/* Round 1 */
FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
/* Round 2 */
GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */
GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
/* Round 3 */
HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
/* Round 4 */
II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
state[0] += a;
state[1] += b;
state[2] += c;
state[3] += d;
}
/* MD5 block update operation. Continues an MD5 message-digest
* operation, processing another message block, and updating the
* context.
*/
void MD5Update(private_hasher_md5_t *this, u_int8_t *input, size_t inputLen)
{
u_int32_t i;
size_t index, partLen;
/* Compute number of bytes mod 64 */
index = (u_int8_t)((this->count[0] >> 3) & 0x3F);
/* Update number of bits */
if ((this->count[0] += (inputLen << 3)) < (inputLen << 3))
{
this->count[1]++;
}
this->count[1] += (inputLen >> 29);
partLen = 64 - index;
/* Transform as many times as possible. */
if (inputLen >= partLen)
{
memcpy(&this->buffer[index], input, partLen);
MD5Transform (this->state, this->buffer);
for (i = partLen; i + 63 < inputLen; i += 64)
{
MD5Transform (this->state, &input[i]);
}
index = 0;
}
else
{
i = 0;
}
/* Buffer remaining input */
memcpy(&this->buffer[index], &input[i], inputLen-i);
}
/* MD5 finalization. Ends an MD5 message-digest operation, writing the
* the message digest and zeroizing the context.
*/
void MD5Final (private_hasher_md5_t *this, u_int8_t digest[16])
{
u_int8_t bits[8];
size_t index, padLen;
/* Save number of bits */
Encode (bits, this->count, 8);
/* Pad out to 56 mod 64. */
index = (size_t)((this->count[0] >> 3) & 0x3f);
padLen = (index < 56) ? (56 - index) : (120 - index);
MD5Update (this, PADDING, padLen);
/* Append length (before padding) */
MD5Update (this, bits, 8);
if (digest != NULL) /* Bill Simpson's padding */
{
/* store state in digest */
Encode (digest, this->state, 16);
}
}
/**
* implementation of hasher_t.get_hash for md5
*/
static status_t get_hash(private_hasher_md5_t *this, chunk_t chunk, u_int8_t *buffer)
{
MD5Update(this, chunk.ptr, chunk.len);
if (buffer != NULL)
{
MD5Final(this, buffer);
this->public.hasher_interface.reset(&(this->public.hasher_interface));
}
return SUCCESS;
}
/**
* implementation of hasher_t.allocate_hash for md5
*/
static status_t allocate_hash(private_hasher_md5_t *this, chunk_t chunk, chunk_t *hash)
{
chunk_t allocated_hash;
MD5Update(this, chunk.ptr, chunk.len);
if (hash != NULL)
{
allocated_hash.ptr = allocator_alloc(BLOCK_SIZE_MD5);
allocated_hash.len = BLOCK_SIZE_MD5;
if (allocated_hash.ptr == NULL)
{
return OUT_OF_RES;
}
MD5Final(this, allocated_hash.ptr);
this->public.hasher_interface.reset(&(this->public.hasher_interface));
*hash = allocated_hash;
}
return SUCCESS;
}
/**
* implementation of hasher_t.get_block_size for md5
*/
static size_t get_block_size(private_hasher_md5_t *this)
{
return BLOCK_SIZE_MD5;
}
/**
* implementation of hasher_t.reset for md5
*/
static status_t reset(private_hasher_md5_t *this)
{
this->state[0] = 0x67452301;
this->state[1] = 0xefcdab89;
this->state[2] = 0x98badcfe;
this->state[3] = 0x10325476;
this->count[0] = 0;
this->count[1] = 0;
return SUCCESS;
}
/**
* implementation of hasher_t.destroy for md5
*/
static status_t destroy(private_hasher_md5_t *this)
{
allocator_free(this);
return SUCCESS;
}
/*
* Described in header
*/
hasher_md5_t *hasher_md5_create()
{
private_hasher_md5_t *this = allocator_alloc_thing(private_hasher_md5_t);
if (this == NULL)
{
return NULL;
}
this->public.hasher_interface.get_hash = (status_t (*) (hasher_t*, chunk_t, u_int8_t*))get_hash;
this->public.hasher_interface.allocate_hash = (status_t (*) (hasher_t*, chunk_t, chunk_t*))allocate_hash;
this->public.hasher_interface.get_block_size = (size_t (*) (hasher_t*))get_block_size;
this->public.hasher_interface.reset = (size_t (*) (hasher_t*))reset;
this->public.hasher_interface.destroy = (size_t (*) (hasher_t*))destroy;
/* initialize */
this->public.hasher_interface.reset(&(this->public.hasher_interface));
return &(this->public);
}

View File

@ -0,0 +1,53 @@
/**
* @file hasher_md5.h
*
* @brief Implementation of hasher_t interface using the
* md5 algorithm.
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#ifndef HASHER_MD5_H_
#define HASHER_MD5_H_
#include "hasher.h"
/**
* Object representing the md5 hasher
*
*/
typedef struct hasher_md5_s hasher_md5_t;
struct hasher_md5_s {
/**
* generic hasher_t interface for this hasher
*/
hasher_t hasher_interface;
};
/**
* Creates a new hasher_md5_t object
*
* @return
* - hasher_md5_t if successfully
* - NULL if out of ressources
*/
hasher_md5_t *hasher_md5_create();
#endif /*HASHER_md5_H_*/