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

- moved hasher_*_t to *_hasher_t

Browse Source 
- some logging improvements
This commit is contained in:
Martin Willi
2005-11-27 14:04:16 +00:00
parent 9d086b79f6
commit b241048084
18 changed files with 180 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/charon/testcases/Makefile.testcases
+2 -6
View File
@@ -19,10 +19,6 @@ TEST_OBJS+= $(BUILD_DIR)diffie_hellman_test.o
$(BUILD_DIR)diffie_hellman_test.o : $(TESTCASES_DIR)diffie_hellman_test.c $(TESTCASES_DIR)diffie_hellman_test.h
$(CC) $(CFLAGS) -c -o $@ $<
TEST_OBJS+= $(BUILD_DIR)hasher_md5_test.o
$(BUILD_DIR)hasher_md5_test.o : $(TESTCASES_DIR)hasher_md5_test.c $(TESTCASES_DIR)hasher_md5_test.h
$(CC) $(CFLAGS) -c -o $@ $<
TEST_OBJS+= $(BUILD_DIR)event_queue_test.o
$(BUILD_DIR)event_queue_test.o : $(TESTCASES_DIR)event_queue_test.c $(TESTCASES_DIR)event_queue_test.h
$(CC) $(CFLAGS) -c -o $@ $<
@@ -43,8 +39,8 @@ TEST_OBJS+= $(BUILD_DIR)parser_test.o
$(BUILD_DIR)parser_test.o : $(TESTCASES_DIR)parser_test.c $(TESTCASES_DIR)parser_test.h
$(CC) $(CFLAGS) -c -o $@ $<
TEST_OBJS+= $(BUILD_DIR)hasher_sha1_test.o
$(BUILD_DIR)hasher_sha1_test.o : $(TESTCASES_DIR)hasher_sha1_test.c $(TESTCASES_DIR)hasher_sha1_test.h
TEST_OBJS+= $(BUILD_DIR)hasher_test.o
$(BUILD_DIR)hasher_test.o : $(TESTCASES_DIR)hasher_test.c $(TESTCASES_DIR)hasher_test.h
$(CC) $(CFLAGS) -c -o $@ $<
TEST_OBJS+= $(BUILD_DIR)ike_sa_manager_test.o
Source/charon/testcases/hasher_md5_test.h
-37
View File
@@ -1,37 +0,0 @@
/**
* @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_*/
Source/charon/testcases/hasher_sha1_test.c
-106
View File
@@ -1,106 +0,0 @@
/**
* @file hasher_sha1_test.h
*
* @brief Tests the sha1 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_sha1_test.h"
#include <utils/allocator.h>
/*
* described in Header-File
*/
void test_hasher_sha1(tester_t *tester)
{
/*
* Test Vectors (from FIPS PUB 180-1)
* "abc"
* A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
* "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
* 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
* A million repetitions of "a"
* 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
*/
hasher_t *hasher = hasher_create(HASH_SHA1);
u_int8_t hash_buffer[20];
chunk_t abc, abcdb, aaa, hash_chunk;
u_int32_t i;
u_int8_t hash_abc[] = {
0xA9,0x99,0x3E,0x36,
0x47,0x06,0x81,0x6A,
0xBA,0x3E,0x25,0x71,
0x78,0x50,0xC2,0x6C,
0x9C,0xD0,0xD8,0x9D
};
u_int8_t hash_abcdb[] = {
0x84,0x98,0x3E,0x44,
0x1C,0x3B,0xD2,0x6E,
0xBA,0xAE,0x4A,0xA1,
0xF9,0x51,0x29,0xE5,
0xE5,0x46,0x70,0xF1
};
u_int8_t hash_aaa[] = {
0x34,0xAA,0x97,0x3C,
0xD4,0xC4,0xDA,0xA4,
0xF6,0x1E,0xEB,0x2B,
0xDB,0xAD,0x27,0x31,
0x65,0x34,0x01,0x6F
};
abc.ptr = "abc";
abc.len = 3;
abcdb.ptr = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
abcdb.len = strlen(abcdb.ptr);
aaa.ptr = "aaaaaaaaaa"; /* 10 a's */
aaa.len = 10;
tester->assert_true(tester, hasher->get_block_size(hasher) == 20, "block size");
/* simple hashing, using "abc" */
hasher->get_hash(hasher, abc, hash_buffer);
tester->assert_false(tester, memcmp(hash_buffer, hash_abc, 20), "hash for abc");
/* with allocation, using "abcdb..." */
hasher->reset(hasher);
hasher->allocate_hash(hasher, abcdb, &hash_chunk);
tester->assert_true(tester, hash_chunk.len == 20, "chunk len");
tester->assert_false(tester, memcmp(hash_chunk.ptr, hash_abcdb, hash_chunk.len), "hash for abcdb...");
allocator_free(hash_chunk.ptr);
/* updating, using "aaaaaaa..." */
hasher->reset(hasher);
for(i=0; i<100000; i++)
{
if (i != 99999)
{
hasher->get_hash(hasher, aaa, NULL);
}
else
{
hasher->get_hash(hasher, aaa, hash_buffer);
}
}
tester->assert_false(tester, memcmp(hash_buffer, hash_aaa, 20), "hash for aaa...");
tester->assert_true(tester, (hasher->destroy(hasher) == SUCCESS), "destroy call test");
}
Source/charon/testcases/hasher_md5_test.c → Source/charon/testcases/hasher_test.c
+81 -3
View File
@@ -1,5 +1,5 @@
/**
* @file hasher_md5_test.h
* @file md5_hasher_test.h
*
* @brief Tests the md5 hasher
*
@@ -22,7 +22,7 @@
#include <string.h>
#include "hasher_md5_test.h"
#include "hasher_test.h"
#include <utils/allocator.h>
@@ -30,7 +30,7 @@
/*
* described in Header-File
*/
void test_hasher_md5(tester_t *tester)
void test_md5_hasher(tester_t *tester)
{
/*
* Test vectors from RFC1321:
@@ -92,3 +92,81 @@ void test_hasher_md5(tester_t *tester)
allocator_free(hash_chunk.ptr);
tester->assert_true(tester, (hasher->destroy(hasher) == SUCCESS), "destroy call test");
}
/*
* described in Header-File
*/
void test_sha1_hasher(tester_t *tester)
{
/*
* Test Vectors (from FIPS PUB 180-1)
* "abc"
* A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
* "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
* 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
* A million repetitions of "a"
* 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
*/
hasher_t *hasher = hasher_create(HASH_SHA1);
u_int8_t hash_buffer[20];
chunk_t abc, abcdb, aaa, hash_chunk;
u_int32_t i;
u_int8_t hash_abc[] = {
0xA9,0x99,0x3E,0x36,
0x47,0x06,0x81,0x6A,
0xBA,0x3E,0x25,0x71,
0x78,0x50,0xC2,0x6C,
0x9C,0xD0,0xD8,0x9D
};
u_int8_t hash_abcdb[] = {
0x84,0x98,0x3E,0x44,
0x1C,0x3B,0xD2,0x6E,
0xBA,0xAE,0x4A,0xA1,
0xF9,0x51,0x29,0xE5,
0xE5,0x46,0x70,0xF1
};
u_int8_t hash_aaa[] = {
0x34,0xAA,0x97,0x3C,
0xD4,0xC4,0xDA,0xA4,
0xF6,0x1E,0xEB,0x2B,
0xDB,0xAD,0x27,0x31,
0x65,0x34,0x01,0x6F
};
abc.ptr = "abc";
abc.len = 3;
abcdb.ptr = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
abcdb.len = strlen(abcdb.ptr);
aaa.ptr = "aaaaaaaaaa"; /* 10 a's */
aaa.len = 10;
tester->assert_true(tester, hasher->get_block_size(hasher) == 20, "block size");
/* simple hashing, using "abc" */
hasher->get_hash(hasher, abc, hash_buffer);
tester->assert_false(tester, memcmp(hash_buffer, hash_abc, 20), "hash for abc");
/* with allocation, using "abcdb..." */
hasher->reset(hasher);
hasher->allocate_hash(hasher, abcdb, &hash_chunk);
tester->assert_true(tester, hash_chunk.len == 20, "chunk len");
tester->assert_false(tester, memcmp(hash_chunk.ptr, hash_abcdb, hash_chunk.len), "hash for abcdb...");
allocator_free(hash_chunk.ptr);
/* updating, using "aaaaaaa..." */
hasher->reset(hasher);
for(i=0; i<100000; i++)
{
if (i != 99999)
{
hasher->get_hash(hasher, aaa, NULL);
}
else
{
hasher->get_hash(hasher, aaa, hash_buffer);
}
}
tester->assert_false(tester, memcmp(hash_buffer, hash_aaa, 20), "hash for aaa...");
tester->assert_true(tester, (hasher->destroy(hasher) == SUCCESS), "destroy call test");
}
Source/charon/testcases/hasher_sha1_test.h → Source/charon/testcases/hasher_test.h
+15 -7
View File
@@ -1,7 +1,7 @@
/**
* @file hasher_sha1_test.h
* @file hasher_test.h
*
* @brief Tests the sha1 hasher
* @brief Tests the hashers
*
*/
@@ -20,11 +20,12 @@
* for more details.
*/
#ifndef HASHER_SHA1_TEST_H_
#define HASHER_SHA1_TEST_H_
#ifndef HASHER_TEST_H_
#define HASHER_TEST_H_
#include <transforms/hashers/hasher.h>
#include <transforms/hashers/hasher_sha1.h>
#include <transforms/hashers/md5_hasher.h>
#include <transforms/hashers/sha1_hasher.h>
#include <utils/tester.h>
/**
@@ -32,6 +33,13 @@
*
* @param tester associated tester object
*/
void test_hasher_sha1(tester_t *tester);
void test_sha1_hasher(tester_t *tester);
#endif /*HASHER_SHA1_TEST_H_*/
/**
* @brief Test function used to test the md5-hasher functionality
*
* @param tester associated tester object
*/
void test_md5_hasher(tester_t *tester);
#endif /*HASHER_TEST_H_*/
Source/charon/testcases/testcases.c
+7 -8
View File
@@ -48,8 +48,7 @@
#include <testcases/parser_test.h>
#include <testcases/packet_test.h>
#include <testcases/diffie_hellman_test.h>
#include <testcases/hasher_sha1_test.h>
#include <testcases/hasher_md5_test.h>
#include <testcases/hasher_test.h>
#include <testcases/hmac_test.h>
#include <testcases/prf_plus_test.h>
@@ -179,12 +178,12 @@ test_t diffie_hellman_test = {test_diffie_hellman,"Diffie Hellman"};
/**
* Test for sha1 hasher
*/
test_t hasher_sha1_test = {test_hasher_sha1,"SHA1 hasher"};
test_t sha1_hasher_test = {test_sha1_hasher,"SHA1 hasher"};
/**
* Test for md5 hasher
*/
test_t hasher_md5_test = {test_hasher_md5,"MD5 hasher"};
test_t md5_hasher_test = {test_md5_hasher,"MD5 hasher"};
/**
* Test for hmac
@@ -271,14 +270,14 @@ logger_manager_t *global_logger_manager;
&ike_sa_manager_test,
&packet_test,
&diffie_hellman_test,
&hasher_sha1_test,
&hasher_md5_test,
&sha1_hasher_test,
&md5_hasher_test,
&hmac_test1,
&hmac_test2,
&prf_plus_test,
NULL
};
global_logger_manager = logger_manager_create(FULL);
global_logger_manager = logger_manager_create(0);
global_socket = socket_create(4600);
@@ -294,7 +293,7 @@ logger_manager_t *global_logger_manager;
tester->perform_tests(tester,all_tests);
// tester->perform_test(tester,&hasher_sha1_test);
// tester->perform_test(tester,&sha1_hasher_test);