From fb6a33360fd99b19f557a1721475da9d4dd6b05c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 5 Mar 2012 16:13:07 +0000 Subject: [PATCH] [rng] Allow hash_df() to accept multiple underlying hash algorithms Signed-off-by: Michael Brown --- src/crypto/entropy.c | 3 +- src/crypto/hash_df.c | 17 +++-- src/include/ipxe/entropy.h | 13 +++- src/include/ipxe/hash_df.h | 18 +---- src/tests/hash_df_test.c | 145 +++++++++++++++++++------------------ 5 files changed, 101 insertions(+), 95 deletions(-) diff --git a/src/crypto/entropy.c b/src/crypto/entropy.c index ab574a94..cb3d54d8 100644 --- a/src/crypto/entropy.c +++ b/src/crypto/entropy.c @@ -454,7 +454,8 @@ int get_entropy_input_tmp ( unsigned int num_samples, uint8_t *tmp, /* 5.4. tmp = tmp XOR * df ( ( nonce || entropy_bitstring ), n ) */ - hash_df ( &data, sizeof ( data ), df_buf, sizeof ( df_buf ) ); + hash_df ( &entropy_hash_df_algorithm, &data, sizeof ( data ), + df_buf, sizeof ( df_buf ) ); for ( i = 0 ; i < tmp_len ; i++ ) tmp[i] ^= df_buf[i]; diff --git a/src/crypto/hash_df.c b/src/crypto/hash_df.c index 1074f8ca..250c2ffc 100644 --- a/src/crypto/hash_df.c +++ b/src/crypto/hash_df.c @@ -45,6 +45,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); /** * Distribute entropy throughout a buffer * + * @v hash Underlying hash algorithm * @v input Input data * @v input_len Length of input data, in bytes * @v output Output buffer @@ -63,10 +64,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); * There is no way for the Hash_df function to fail. The returned * status SUCCESS is implicit. */ -void hash_df ( const void *input, size_t input_len, void *output, - size_t output_len ) { - uint8_t context[HASH_DF_CTX_SIZE]; - uint8_t digest[HASH_DF_OUTLEN_BYTES]; +void hash_df ( struct digest_algorithm *hash, const void *input, + size_t input_len, void *output, size_t output_len ) { + uint8_t context[hash->ctxsize]; + uint8_t digest[hash->digestsize]; size_t frag_len; struct { uint8_t pad[3]; @@ -106,12 +107,12 @@ void hash_df ( const void *input, size_t input_len, void *output, * || input_string ) */ prefix.no_of_bits_to_return = htonl ( output_len * 8 ); - digest_init ( &hash_df_algorithm, context ); - digest_update ( &hash_df_algorithm, context, &prefix.counter, + digest_init ( hash, context ); + digest_update ( hash, context, &prefix.counter, ( sizeof ( prefix ) - offsetof ( typeof ( prefix ), counter ) ) ); - digest_update ( &hash_df_algorithm, context, input, input_len ); - digest_final ( &hash_df_algorithm, context, digest ); + digest_update ( hash, context, input, input_len ); + digest_final ( hash, context, digest ); /* 4.2 counter = counter + 1 */ prefix.counter++; diff --git a/src/include/ipxe/entropy.h b/src/include/ipxe/entropy.h index 8a1974a1..7208ac87 100644 --- a/src/include/ipxe/entropy.h +++ b/src/include/ipxe/entropy.h @@ -14,6 +14,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include #include #include +#include #include /** @@ -99,6 +100,15 @@ int get_noise ( noise_sample_t *noise ); extern int get_entropy_input_tmp ( unsigned int num_samples, uint8_t *tmp, size_t tmp_len ); +/** Use SHA-1 as the underlying hash algorithm for Hash_df + * + * Hash_df using SHA-1 is an Approved algorithm in ANS X9.82. + */ +#define entropy_hash_df_algorithm sha1_algorithm + +/** Underlying hash algorithm output length (in bytes) */ +#define ENTROPY_HASH_DF_OUTLEN_BYTES SHA1_DIGEST_SIZE + /** * Obtain entropy input * @@ -192,7 +202,8 @@ get_entropy_input ( unsigned int min_entropy_bits, void *data, size_t min_len, return min_len; } else if ( tmp_len > max_len ) { linker_assert ( ( tmp == tmp_buf ), data_inplace ); - hash_df ( tmp, tmp_len, data, max_len ); + hash_df ( &entropy_hash_df_algorithm, tmp, tmp_len, + data, max_len ); return max_len; } else { /* (Data is already in-place.) */ diff --git a/src/include/ipxe/hash_df.h b/src/include/ipxe/hash_df.h index 003e5cef..607a4a61 100644 --- a/src/include/ipxe/hash_df.h +++ b/src/include/ipxe/hash_df.h @@ -10,21 +10,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include -#include +#include -/** Use SHA-1 as the underlying hash algorithm - * - * Hash_df using SHA-1 is an Approved algorithm in ANS X9.82. - */ -#define hash_df_algorithm sha1_algorithm - -/** Underlying hash algorithm output length (in bytes) */ -#define HASH_DF_OUTLEN_BYTES SHA1_DIGEST_SIZE - -/** Underlying hash algorithm context size (in bytes) */ -#define HASH_DF_CTX_SIZE SHA1_CTX_SIZE - -extern void hash_df ( const void *input, size_t input_len, void *output, - size_t output_len ); +extern void hash_df ( struct digest_algorithm *hash, const void *input, + size_t input_len, void *output, size_t output_len ); #endif /* _IPXE_HASH_DF_H */ diff --git a/src/tests/hash_df_test.c b/src/tests/hash_df_test.c index 201b4a18..55de8cff 100644 --- a/src/tests/hash_df_test.c +++ b/src/tests/hash_df_test.c @@ -35,6 +35,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include #include #include +#include #include /** Define inline input data */ @@ -45,6 +46,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); /** A Hash_df test */ struct hash_df_test { + /** Underlying hash algorithm */ + struct digest_algorithm *hash; /** Input data */ const void *input; /** Length of input data */ @@ -59,22 +62,24 @@ struct hash_df_test { * Define a Hash_df test * * @v name Test name + * @v hash_algorithm Underlying hash algorithm * @v input_array Input data * @v expected_array Expected output data * @ret test Hash_df test */ -#define HASH_DF_TEST( name, input_array, expected_array ) \ - static const uint8_t name ## _input [] = input_array; \ - static const uint8_t name ## _expected [] = expected_array; \ - static const struct hash_df_test name = { \ - .input = name ## _input, \ - .input_len = sizeof ( name ## _input ), \ - .expected = name ## _expected, \ - .expected_len = sizeof ( name ## _expected ), \ +#define HASH_DF_TEST( name, hash_algorithm, input_array, expected_array ) \ + static const uint8_t name ## _input [] = input_array; \ + static const uint8_t name ## _expected [] = expected_array; \ + static const struct hash_df_test name = { \ + .hash = &(hash_algorithm), \ + .input = name ## _input, \ + .input_len = sizeof ( name ## _input ), \ + .expected = name ## _expected, \ + .expected_len = sizeof ( name ## _expected ), \ } -/** Test 1 */ -HASH_DF_TEST ( test_1, +/** SHA-1 Test 1 */ +HASH_DF_TEST ( test_sha1_1, sha1_algorithm, INPUT ( 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, @@ -88,8 +93,8 @@ HASH_DF_TEST ( test_1, 0x67, 0x67, 0xb0, 0x5e, 0x83, 0xa9, 0x80, 0x40, 0x6d, 0x94, 0xbe, 0xe3, 0x3c, 0xbb, 0x89 ) ); -/** Test 2 */ -HASH_DF_TEST ( test_2, +/** SHA-1 Test 2 */ +HASH_DF_TEST ( test_sha1_2, sha1_algorithm, INPUT ( 0x00, 0xd0, 0x8f, 0xb4, 0x41, 0xf2, 0xf4, 0xcb, 0x37, 0xcf, 0x6c, 0x24, 0x20, 0xa8, 0x2c, 0x74, 0x27, 0xac, 0xf7, 0xfc, 0xfd, 0x79, 0x90, 0x14, 0x38, 0x34, 0xa5, 0xc2, 0x56, 0xab, @@ -103,8 +108,8 @@ HASH_DF_TEST ( test_2, 0x86, 0x3d, 0xa8, 0x81, 0xff, 0xcb, 0xb4, 0x34, 0xa6, 0xcc, 0xb7, 0xda, 0x2f, 0xb2, 0x10 ) ); -/** Test 3 */ -HASH_DF_TEST ( test_3, +/** SHA-1 Test 3 */ +HASH_DF_TEST ( test_sha1_3, sha1_algorithm, INPUT ( 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, @@ -124,8 +129,8 @@ HASH_DF_TEST ( test_3, 0xe0, 0x2e, 0x85, 0xa2, 0x31, 0x4c, 0xe3, 0xd7, 0x4a, 0x93, 0x32, 0x4b, 0x27, 0xbd, 0xe8 ) ); -/** Test 4 */ -HASH_DF_TEST ( test_4, +/** SHA-1 Test 4 */ +HASH_DF_TEST ( test_sha1_4, sha1_algorithm, INPUT ( 0x00, 0x99, 0xb9, 0x53, 0x7b, 0x84, 0x27, 0xb8, 0xce, 0x23, 0x21, 0x9a, 0x61, 0x1c, 0xbe, 0x61, 0x06, 0x44, 0xcf, 0x85, 0x03, 0xee, 0xc5, 0xba, 0x22, 0xde, 0x1a, 0xb2, 0x12, 0xc3, @@ -139,8 +144,8 @@ HASH_DF_TEST ( test_4, 0xf4, 0x85, 0xda, 0x6c, 0xbf, 0x04, 0x16, 0xdc, 0xdc, 0x5f, 0xb8, 0xbc, 0x9c, 0x94, 0xb6 ) ); -/** Test 5 */ -HASH_DF_TEST ( test_5, +/** SHA-1 Test 5 */ +HASH_DF_TEST ( test_sha1_5, sha1_algorithm, INPUT ( 0x01, 0xd0, 0x8f, 0xb4, 0x41, 0xf2, 0xf4, 0xcb, 0x37, 0xcf, 0x6c, 0x24, 0x20, 0xa8, 0x2c, 0x74, 0x27, 0xac, 0xf7, 0xfc, 0xfd, 0x79, 0x90, 0x14, 0x38, 0x34, 0xa5, 0xc2, 0x56, 0xab, @@ -160,8 +165,8 @@ HASH_DF_TEST ( test_5, 0xb7, 0xc9, 0x89, 0x4f, 0xb8, 0x84, 0x65, 0xe0, 0xcf, 0xd1, 0xcc, 0x26, 0x1e, 0x22, 0xc5 ) ); -/** Test 6 */ -HASH_DF_TEST ( test_6, +/** SHA-1 Test 6 */ +HASH_DF_TEST ( test_sha1_6, sha1_algorithm, INPUT ( 0x00, 0x0a, 0x04, 0x41, 0xa5, 0x2b, 0xed, 0xf7, 0x94, 0xf5, 0xaa, 0x62, 0x7b, 0xcb, 0xd8, 0x1f, 0x93, 0xe0, 0x11, 0xd5, 0x1f, 0x34, 0x74, 0x80, 0x2c, 0x37, 0x50, 0x76, 0x75, 0x51, @@ -175,8 +180,8 @@ HASH_DF_TEST ( test_6, 0x8a, 0xf8, 0x47, 0xca, 0xcc, 0x4c, 0x92, 0xc6, 0x14, 0x44, 0x85, 0xc2, 0x27, 0xca, 0x05 ) ); -/** Test 7 */ -HASH_DF_TEST ( test_7, +/** SHA-1 Test 7 */ +HASH_DF_TEST ( test_sha1_7, sha1_algorithm, INPUT ( 0x01, 0x0e, 0x16, 0x0a, 0x56, 0x07, 0x95, 0x4e, 0x7d, 0x79, 0xd5, 0xa2, 0x2b, 0xf9, 0x08, 0x0b, 0x10, 0xce, 0xb7, 0x3c, 0x62, 0x23, 0x07, 0xf9, 0xf5, 0x45, 0xbd, 0xb1, 0xa4, 0x61, @@ -196,8 +201,8 @@ HASH_DF_TEST ( test_7, 0x51, 0x64, 0x54, 0x37, 0x28, 0x71, 0x7f, 0x17, 0x1f, 0xdb, 0x02, 0xb2, 0xad, 0x57, 0x95 ) ); -/** Test 8 */ -HASH_DF_TEST ( test_8, +/** SHA-1 Test 8 */ +HASH_DF_TEST ( test_sha1_8, sha1_algorithm, INPUT ( 0x00, 0xdc, 0x24, 0xdf, 0x10, 0x2f, 0xa9, 0xf9, 0x6c, 0xc1, 0xcf, 0xf8, 0xc1, 0x16, 0xc7, 0x9d, 0x14, 0x97, 0xd7, 0xc2, 0x7b, 0xba, 0x5b, 0xa8, 0x01, 0xe1, 0x56, 0x21, 0x93, 0x35, @@ -211,8 +216,8 @@ HASH_DF_TEST ( test_8, 0xd6, 0x41, 0x5f, 0x37, 0x83, 0xb0, 0x15, 0x67, 0x89, 0x1b, 0x57, 0x66, 0x2a, 0xbb, 0x39 ) ); -/** Test 9 */ -HASH_DF_TEST ( test_9, +/** SHA-1 Test 9 */ +HASH_DF_TEST ( test_sha1_9, sha1_algorithm, INPUT ( 0x01, 0xd0, 0x8f, 0xb4, 0x41, 0xf2, 0xf4, 0xcb, 0x37, 0xcf, 0x6c, 0x24, 0x20, 0xa8, 0x2c, 0x74, 0x27, 0xac, 0xf7, 0xfc, 0xfd, 0x79, 0x90, 0x14, 0x38, 0x34, 0xa5, 0xc2, 0x56, 0xab, @@ -237,8 +242,8 @@ HASH_DF_TEST ( test_9, 0xb4, 0x5d, 0x89, 0xdb, 0x61, 0x2c, 0xd9, 0xd2, 0x8a, 0x55, 0xc0, 0xf0, 0xd1, 0xf8, 0xf9 ) ); -/** Test 10 */ -HASH_DF_TEST ( test_10, +/** SHA-1 Test 10 */ +HASH_DF_TEST ( test_sha1_10, sha1_algorithm, INPUT ( 0x00, 0x8f, 0xde, 0xc9, 0xe6, 0x18, 0x96, 0x36, 0xf0, 0xa5, 0xce, 0x53, 0xe8, 0x1c, 0x13, 0xac, 0x93, 0x84, 0xfa, 0xfb, 0xa0, 0xee, 0x50, 0xc1, 0xe2, 0xc8, 0xa0, 0x99, 0xde, 0x41, @@ -252,8 +257,8 @@ HASH_DF_TEST ( test_10, 0x51, 0x95, 0xf4, 0x79, 0xcd, 0x76, 0x20, 0x22, 0x35, 0x10, 0x2e, 0xf6, 0x27, 0x29, 0x19 ) ); -/** Test 11 */ -HASH_DF_TEST ( test_11, +/** SHA-1 Test 11 */ +HASH_DF_TEST ( test_sha1_11, sha1_algorithm, INPUT ( 0x01, 0x27, 0xaf, 0x40, 0x17, 0xca, 0xc5, 0xb3, 0x86, 0x24, 0xe8, 0x4c, 0x2d, 0x10, 0xef, 0xd7, 0x8d, 0xf4, 0xf4, 0x77, 0xd6, 0x54, 0x69, 0x5a, 0x04, 0x32, 0x32, 0x6b, 0x3a, 0x1c, @@ -278,8 +283,8 @@ HASH_DF_TEST ( test_11, 0xa3, 0xfe, 0xa1, 0xc7, 0x11, 0x7d, 0x6f, 0x7d, 0xd2, 0xef, 0x77, 0x7d, 0x7c, 0xf3, 0xeb ) ); -/** Test 12 */ -HASH_DF_TEST ( test_12, +/** SHA-1 Test 12 */ +HASH_DF_TEST ( test_sha1_12, sha1_algorithm, INPUT ( 0x00, 0x2c, 0x9c, 0x0d, 0x80, 0x03, 0xe3, 0x40, 0x23, 0xbe, 0x5b, 0x63, 0xfd, 0xb9, 0xd2, 0x24, 0xb4, 0x25, 0x0c, 0xc8, 0x15, 0x5b, 0xd1, 0xee, 0xd8, 0xe5, 0x5d, 0x91, 0x06, 0x2f, @@ -293,8 +298,8 @@ HASH_DF_TEST ( test_12, 0x0e, 0x8b, 0xff, 0xf6, 0x0c, 0xb7, 0x7f, 0xa5, 0x4b, 0xb1, 0x1a, 0x83, 0x31, 0xcb, 0x24 ) ); -/** Test 13 */ -HASH_DF_TEST ( test_13, +/** SHA-1 Test 13 */ +HASH_DF_TEST ( test_sha1_13, sha1_algorithm, INPUT ( 0x01, 0x99, 0xb9, 0x53, 0x7b, 0x84, 0x27, 0xb8, 0xce, 0x23, 0x21, 0x9a, 0x61, 0x1c, 0xbe, 0x61, 0x06, 0x44, 0xcf, 0x85, 0x03, 0xee, 0xc5, 0xba, 0x22, 0xde, 0x1a, 0xb2, 0x12, 0xc3, @@ -314,8 +319,8 @@ HASH_DF_TEST ( test_13, 0xf0, 0x0c, 0x3b, 0xda, 0x59, 0x6b, 0x10, 0x88, 0x61, 0xf0, 0x6b, 0xf9, 0x1b, 0x45, 0xd6 ) ); -/** Test 14 */ -HASH_DF_TEST ( test_14, +/** SHA-1 Test 14 */ +HASH_DF_TEST ( test_sha1_14, sha1_algorithm, INPUT ( 0x00, 0xe5, 0x04, 0x3d, 0x1b, 0x95, 0x4b, 0x34, 0xba, 0x60, 0xd2, 0x48, 0xe8, 0x83, 0xef, 0x49, 0x8c, 0x5c, 0x52, 0x36, 0xb8, 0x26, 0x0e, 0x23, 0x8e, 0x02, 0xc8, 0xd4, 0xfc, 0x5f, @@ -329,8 +334,8 @@ HASH_DF_TEST ( test_14, 0xa6, 0xbc, 0xfc, 0xfc, 0x0f, 0x51, 0xfe, 0x2f, 0x77, 0xc1, 0xc9, 0x9d, 0xf0, 0xa2, 0x09 ) ); -/** Test 15 */ -HASH_DF_TEST ( test_15, +/** SHA-1 Test 15 */ +HASH_DF_TEST ( test_sha1_15, sha1_algorithm, INPUT ( 0x01, 0x04, 0x43, 0xa0, 0x2c, 0x82, 0x5c, 0x31, 0x59, 0xf4, 0x5e, 0x8c, 0x0a, 0xe5, 0x9e, 0x8c, 0x76, 0x45, 0x69, 0x95, 0xc0, 0x35, 0x40, 0x46, 0x6a, 0x14, 0x54, 0x7c, 0xcb, 0xe8, @@ -350,8 +355,8 @@ HASH_DF_TEST ( test_15, 0xd2, 0x7e, 0x2b, 0x2e, 0x42, 0x2b, 0x32, 0xb9, 0x7f, 0x05, 0x0d, 0x1b, 0xd2, 0xb4, 0x90 ) ); -/** Test 16 */ -HASH_DF_TEST ( test_16, +/** SHA-1 Test 16 */ +HASH_DF_TEST ( test_sha1_16, sha1_algorithm, INPUT ( 0x00, 0x9d, 0xc3, 0x52, 0x08, 0xee, 0x2b, 0x8c, 0x58, 0x1e, 0xa3, 0x0b, 0xaa, 0xcb, 0x5d, 0x74, 0x31, 0x7a, 0x87, 0x94, 0x54, 0x10, 0x71, 0x7e, 0x58, 0xd3, 0x70, 0x5f, 0xbd, 0xc7, @@ -365,8 +370,8 @@ HASH_DF_TEST ( test_16, 0xef, 0x85, 0x76, 0xe7, 0x5c, 0xb3, 0xcf, 0xe8, 0x22, 0x07, 0x68, 0xb2, 0x6c, 0xe7, 0x7a ) ); -/** Test 17 */ -HASH_DF_TEST ( test_17, +/** SHA-1 Test 17 */ +HASH_DF_TEST ( test_sha1_17, sha1_algorithm, INPUT ( 0x01, 0x99, 0xb9, 0x53, 0x7b, 0x84, 0x27, 0xb8, 0xce, 0x23, 0x21, 0x9a, 0x61, 0x1c, 0xbe, 0x61, 0x06, 0x44, 0xcf, 0x85, 0x03, 0xee, 0xc5, 0xba, 0x22, 0xde, 0x1a, 0xb2, 0x12, 0xc3, @@ -391,8 +396,8 @@ HASH_DF_TEST ( test_17, 0xaa, 0x8a, 0x6e, 0x6b, 0x8e, 0x6d, 0x56, 0xa4, 0x31, 0x33, 0x3b, 0x40, 0x8e, 0x6f, 0xa8 ) ); -/** Test 18 */ -HASH_DF_TEST ( test_18, +/** SHA-1 Test 18 */ +HASH_DF_TEST ( test_sha1_18, sha1_algorithm, INPUT ( 0x00, 0x56, 0x3a, 0x5d, 0x20, 0x7d, 0x37, 0x70, 0x7b, 0xf5, 0xf2, 0x4d, 0x0b, 0xd4, 0x93, 0x5d, 0xc3, 0x8d, 0xbe, 0x04, 0x36, 0x37, 0xb3, 0xff, 0x8a, 0xb6, 0x8c, 0xfc, 0xe2, 0xf2, @@ -406,8 +411,8 @@ HASH_DF_TEST ( test_18, 0xf6, 0xbc, 0xda, 0xf8, 0x1d, 0x28, 0x9c, 0xf4, 0xbd, 0x3c, 0x91, 0xb7, 0x00, 0x5c, 0x18 ) ); -/** Test 19 */ -HASH_DF_TEST ( test_19, +/** SHA-1 Test 19 */ +HASH_DF_TEST ( test_sha1_19, sha1_algorithm, INPUT ( 0x01, 0x1c, 0x0e, 0x46, 0x75, 0x9b, 0x38, 0x55, 0x6a, 0x28, 0xa4, 0x5e, 0x7b, 0x83, 0xe1, 0x4d, 0xb8, 0x62, 0x8d, 0xb1, 0x62, 0x13, 0xe1, 0xba, 0x2d, 0x97, 0x74, 0xf6, 0xc0, 0xac, @@ -432,8 +437,8 @@ HASH_DF_TEST ( test_19, 0x0a, 0xb0, 0x7d, 0x12, 0x08, 0xb6, 0xbd, 0x66, 0x5b, 0x30, 0x0a, 0xa4, 0xdb, 0x9c, 0x3e ) ); -/** Test 20 */ -HASH_DF_TEST ( test_20, +/** SHA-1 Test 20 */ +HASH_DF_TEST ( test_sha1_20, sha1_algorithm, INPUT ( 0x00, 0x60, 0x01, 0x93, 0xc8, 0xf6, 0x03, 0x1a, 0x2d, 0x49, 0x37, 0x2a, 0x8b, 0x0f, 0x60, 0xf6, 0x8c, 0x1d, 0xfd, 0xac, 0xd4, 0xf8, 0xea, 0x01, 0x37, 0x47, 0xd7, 0x14, 0x82, 0x33, @@ -454,8 +459,8 @@ HASH_DF_TEST ( test_20, */ #define hash_df_ok( test ) do { \ uint8_t output[ (test)->expected_len ]; \ - hash_df ( (test)->input, (test)->input_len, output, \ - sizeof ( output ) ); \ + hash_df ( (test)->hash, (test)->input, (test)->input_len, \ + output, sizeof ( output ) ); \ ok ( memcmp ( (test)->expected, output, \ sizeof ( output ) ) == 0 ); \ } while ( 0 ) @@ -466,26 +471,26 @@ HASH_DF_TEST ( test_20, */ static void hash_df_test_exec ( void ) { - hash_df_ok ( &test_1 ); - hash_df_ok ( &test_2 ); - hash_df_ok ( &test_3 ); - hash_df_ok ( &test_4 ); - hash_df_ok ( &test_5 ); - hash_df_ok ( &test_6 ); - hash_df_ok ( &test_7 ); - hash_df_ok ( &test_8 ); - hash_df_ok ( &test_9 ); - hash_df_ok ( &test_10 ); - hash_df_ok ( &test_11 ); - hash_df_ok ( &test_12 ); - hash_df_ok ( &test_13 ); - hash_df_ok ( &test_14 ); - hash_df_ok ( &test_15 ); - hash_df_ok ( &test_16 ); - hash_df_ok ( &test_17 ); - hash_df_ok ( &test_18 ); - hash_df_ok ( &test_19 ); - hash_df_ok ( &test_20 ); + hash_df_ok ( &test_sha1_1 ); + hash_df_ok ( &test_sha1_2 ); + hash_df_ok ( &test_sha1_3 ); + hash_df_ok ( &test_sha1_4 ); + hash_df_ok ( &test_sha1_5 ); + hash_df_ok ( &test_sha1_6 ); + hash_df_ok ( &test_sha1_7 ); + hash_df_ok ( &test_sha1_8 ); + hash_df_ok ( &test_sha1_9 ); + hash_df_ok ( &test_sha1_10 ); + hash_df_ok ( &test_sha1_11 ); + hash_df_ok ( &test_sha1_12 ); + hash_df_ok ( &test_sha1_13 ); + hash_df_ok ( &test_sha1_14 ); + hash_df_ok ( &test_sha1_15 ); + hash_df_ok ( &test_sha1_16 ); + hash_df_ok ( &test_sha1_17 ); + hash_df_ok ( &test_sha1_18 ); + hash_df_ok ( &test_sha1_19 ); + hash_df_ok ( &test_sha1_20 ); } /** Hash_df self-test */