diff options
Diffstat (limited to 'random/jitterentropy.h')
| -rw-r--r-- | random/jitterentropy.h | 157 |
1 files changed, 64 insertions, 93 deletions
diff --git a/random/jitterentropy.h b/random/jitterentropy.h index 2c33256a..28859f5f 100644 --- a/random/jitterentropy.h +++ b/random/jitterentropy.h @@ -39,139 +39,110 @@ * DAMAGE. */ -#ifndef GCRYPT_JITTERENTROPY_H -#define GCRYPT_JITTERENTROPY_H - -/* #ifdef __KERNEL__ */ -/* #include "jitterentropy-base-kernel.h" */ -/* #else */ -/* #include "jitterentropy-base-user.h" */ -/* #endif /\* __KERNEL__ *\/ */ - -/* Statistical data from the entropy source */ -struct entropy_stat { - unsigned int bitslot[64]; /* Counter for the bits set per bit - position in ->data */ - unsigned int bitvar[64]; /* Counter for the number of bit - variations per bit position in - ->data */ - unsigned int enable_bit_test; /* enable bit test - this flag is vital for the accuracy - of the statistic tests: when we - do the time measurements, we want - the observed entropy collection - loop executed as fast as the - unmeasured loop, i.e. without - the bit statistic logic; on the - other hand, the bit statistics - test is not interested in exact - timing */ - u64 collection_begin; /* timer for beginning of one - entropy collection round */ - u64 collection_end; /* timer for end of one round */ - u64 old_delta; /* Time delta of previous round to - calculate delta of deltas */ - unsigned int setbits; /* see _jent_calc_statistic */ - unsigned int varbits; /* see _jent_calc_statistic */ - unsigned int obsbits; /* see _jent_calc_statistic */ - unsigned int collection_loop_cnt; /* Collection loop counter */ -}; +#ifndef _JITTERENTROPY_H +#define _JITTERENTROPY_H + +#ifdef __KERNEL__ +#include "jitterentropy-base-kernel.h" +#else +#include "jitterentropy-base-user.h" +#endif /* __KERNEL__ */ /* The entropy pool */ struct rand_data { - /* all data values that are vital to maintain the security - * of the RNG are marked as SENSITIVE. A user must not - * access that information while the RNG executes its loops to - * calculate the next random value. */ - u64 data; /* SENSITIVE Actual random number */ - u64 prev_time; /* SENSITIVE Previous time stamp */ -#define DATA_SIZE_BITS ((sizeof(u64)) * 8) - u64 last_delta; /* SENSITIVE stuck test */ - int64_t last_delta2; /* SENSITIVE stuck test */ - unsigned int osr; /* Oversample rate */ - unsigned int stir:1; /* Post-processing stirring */ - unsigned int disable_unbias:1; /* Deactivate Von-Neuman unbias */ + /* all data values that are vital to maintain the security + * of the RNG are marked as SENSITIVE. A user must not + * access that information while the RNG executes its loops to + * calculate the next random value. */ + uint64_t data; /* SENSITIVE Actual random number */ + uint64_t old_data; /* SENSITIVE Previous random number */ + uint64_t prev_time; /* SENSITIVE Previous time stamp */ +#define DATA_SIZE_BITS ((sizeof(uint64_t)) * 8) + uint64_t last_delta; /* SENSITIVE stuck test */ + int64_t last_delta2; /* SENSITIVE stuck test */ + unsigned int osr; /* Oversample rate */ + int fips_enabled; /* FIPS enabled? */ + unsigned int stir:1; /* Post-processing stirring */ + unsigned int disable_unbias:1; /* Deactivate Von-Neuman unbias */ #define JENT_MEMORY_BLOCKS 64 #define JENT_MEMORY_BLOCKSIZE 32 #define JENT_MEMORY_ACCESSLOOPS 128 #define JENT_MEMORY_SIZE (JENT_MEMORY_BLOCKS*JENT_MEMORY_BLOCKSIZE) - unsigned char *mem; /* Memory access location with size of - * memblocks * memblocksize */ - unsigned int memlocation; /* Pointer to byte in *mem */ - unsigned int memblocks; /* Number of memory blocks in *mem */ - unsigned int memblocksize; /* Size of one memory block in bytes */ - unsigned int memaccessloops; /* Number of memory accesses per random - * bit generation */ -#ifdef CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT - struct entropy_stat entropy_stat; -#endif + unsigned char *mem; /* Memory access location with size of + * memblocks * memblocksize */ + unsigned int memlocation; /* Pointer to byte in *mem */ + unsigned int memblocks; /* Number of memory blocks in *mem */ + unsigned int memblocksize; /* Size of one memory block in bytes */ + unsigned int memaccessloops; /* Number of memory accesses per random + * bit generation */ }; /* Flags that can be used to initialize the RNG */ #define JENT_DISABLE_STIR (1<<0) /* Disable stirring the entropy pool */ #define JENT_DISABLE_UNBIAS (1<<1) /* Disable the Von-Neuman Unbiaser */ #define JENT_DISABLE_MEMORY_ACCESS (1<<2) /* Disable memory access for more - entropy, saves MEMORY_SIZE RAM for - entropy collector */ - -#define DRIVER_NAME "jitterentropy" + entropy, saves MEMORY_SIZE RAM for + entropy collector */ /* -- BEGIN Main interface functions -- */ +#ifndef JENT_STUCK_INIT_THRES +/* + * Per default, not more than 90% of all measurements during initialization + * are allowed to be stuck. + * + * It is allowed to change this value as required for the intended environment. + */ +#define JENT_STUCK_INIT_THRES(x) (x/10 * 9) +#endif + +#ifdef JENT_PRIVATE_COMPILE +# define JENT_PRIVATE_STATIC static +#else /* JENT_PRIVATE_COMPILE */ +# define JENT_PRIVATE_STATIC +#endif + /* Number of low bits of the time value that we want to consider */ /* get raw entropy */ -static int jent_read_entropy (struct rand_data *ec, - char *data, size_t len); - +JENT_PRIVATE_STATIC +ssize_t jent_read_entropy(struct rand_data *ec, char *data, size_t len); /* initialize an instance of the entropy collector */ -static struct rand_data *jent_entropy_collector_alloc (unsigned int osr, - unsigned int flags); - +JENT_PRIVATE_STATIC +struct rand_data *jent_entropy_collector_alloc(unsigned int osr, + unsigned int flags); /* clearing of entropy collector */ -static void jent_entropy_collector_free (struct rand_data *ent_coll); +JENT_PRIVATE_STATIC +void jent_entropy_collector_free(struct rand_data *entropy_collector); /* initialization of entropy collector */ -static int jent_entropy_init (void); +JENT_PRIVATE_STATIC +int jent_entropy_init(void); /* return version number of core library */ -/* unsigned int jent_version(void); */ +JENT_PRIVATE_STATIC +unsigned int jent_version(void); /* -- END of Main interface functions -- */ /* -- BEGIN error codes for init function -- */ -/* FIXME!!! */ -#define ENOTIME 1 /* Timer service not available */ +#define ENOTIME 1 /* Timer service not available */ #define ECOARSETIME 2 /* Timer too coarse for RNG */ #define ENOMONOTONIC 3 /* Timer is not monotonic increasing */ #define EMINVARIATION 4 /* Timer variations too small for RNG */ #define EVARVAR 5 /* Timer does not produce variations of variations - (2nd derivation of time is zero) */ + (2nd derivation of time is zero) */ #define EMINVARVAR 6 /* Timer variations of variations is too small */ #define EPROGERR 7 /* Programming error */ +#define ESTUCK 8 /* Too many stuck results during init. */ /* -- BEGIN statistical test functions only complied with CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT -- */ #ifdef CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT - -static void jent_init_statistic(struct rand_data *entropy_collector); -static void jent_calc_statistic(struct rand_data *entropy_collector, - struct entropy_stat *stat, unsigned int loop_cnt); -static void jent_bit_count (struct rand_data *entropy_collector, u64 prev_data); - -static void jent_gen_entropy_stat (struct rand_data *entropy_collector, - struct entropy_stat *stat); -static void jent_lfsr_time_stat(struct rand_data *ec, u64 *fold, u64 *loop_cnt); -static u64 jent_lfsr_var_stat(struct rand_data *ec, unsigned int min); - -#else /* CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT */ - -# define jent_init_statistic(x) do { } while (0) -# define jent_calc_statistic(x, y, z) do { } while (0) -# define jent_bit_count(x,y) do { (void)(y); } while (0) - +JENT_PRIVATE_STATIC +uint64_t jent_lfsr_var_stat(struct rand_data *ec, unsigned int min); #endif /* CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT */ /* -- END of statistical test function -- */ -#endif /* GCRYPT_JITTERENTROPY_H */ +#endif /* _JITTERENTROPY_H */ |