sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-24 15:23:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

[rng] Allow hash_df() to accept multiple underlying hash algorithms

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2012-03-05 16:13:07 +00:00
parent c8f52cccfb
commit fb6a33360f
5 changed files with 101 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/include/ipxe/entropy.h
View File

@@ -14,6 +14,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <assert.h>
#include <ipxe/api.h>
#include <ipxe/hash_df.h>
#include <ipxe/sha1.h>
#include <config/entropy.h>
/**
@@ -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.) */

18
src/include/ipxe/hash_df.h
View File

@@ -10,21 +10,9 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
#include <ipxe/sha1.h>
#include <ipxe/crypto.h>
/** 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 */