From bab16ab30a6a73c5c68ea71a3b018fedb4262898 Mon Sep 17 00:00:00 2001 From: rasky Date: Wed, 29 Sep 2010 16:41:27 +0000 Subject: [PATCH] Follow coding convention. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4361 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/sec/entropy.h | 26 +++++++++++++------------- bertos/sec/random_p.h | 3 ++- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/bertos/sec/entropy.h b/bertos/sec/entropy.h index 7d46e0d0..02d06137 100644 --- a/bertos/sec/entropy.h +++ b/bertos/sec/entropy.h @@ -32,7 +32,7 @@ * * \brief Entropy pool generic interface * \author Giovanni Bajo - * + * */ #ifndef SEC_ENTROPY_H @@ -49,15 +49,15 @@ */ #define CONFIG_ENTROPY_NUM_SOURCES 8 -typedef struct EntropyPool_Context +typedef struct EntropyPool { - void (*add_entropy)(struct EntropyPool_Context *ctx, int source_idx, + void (*add_entropy)(struct EntropyPool *ctx, int source_idx, const uint8_t *data, size_t len, int entropy); - bool (*seeding_ready)(struct EntropyPool_Context *ctx); - void (*make_seed)(struct EntropyPool_Context *ctx, uint8_t *out, size_t len); + bool (*seeding_ready)(struct EntropyPool *ctx); + void (*make_seed)(struct EntropyPool *ctx, uint8_t *out, size_t len); -} EntropyPool_Context; +} EntropyPool; /** @@ -66,33 +66,33 @@ typedef struct EntropyPool_Context * bytes. \a entropy is the number of bits of estimated entropy in the * samples. \a source_idx is the index of the entropy source. */ -INLINE void entropy_add(EntropyPool_Context *e, int source_idx, +INLINE void entropy_add(EntropyPool *e, int source_idx, const uint8_t *data, size_t len, int entropy) { ASSERT(e->add_entropy); - e->add_entropy(e, source_idx, data, len, entropy); + e->add_entropy(e, source_idx, data, len, entropy); } /** * Check if the generator is ready to produce a new seed. */ -INLINE bool entropy_seeding_ready(EntropyPool_Context *ctx) +INLINE bool entropy_seeding_ready(EntropyPool *ctx) { ASSERT(ctx->seeding_ready); - return ctx->seeding_ready(ctx); + return ctx->seeding_ready(ctx); } /** * Generate a new seed of the specified length. - * + * * \note This should not be abused to generate a very long seed, since the pool * cannot hold lots of entropy. */ -INLINE void entropy_make_seed(EntropyPool_Context *ctx, uint8_t *out, size_t len) +INLINE void entropy_make_seed(EntropyPool *ctx, uint8_t *out, size_t len) { ASSERT(ctx->make_seed); - ctx->make_seed(ctx, out, len); + ctx->make_seed(ctx, out, len); } #endif /* SEC_ENTROPY_H */ diff --git a/bertos/sec/random_p.h b/bertos/sec/random_p.h index 97d51dad..bf1b7575 100644 --- a/bertos/sec/random_p.h +++ b/bertos/sec/random_p.h @@ -47,7 +47,8 @@ #define POOL_NONE 0 #define POOL_YARROW 1 -#define POOL_NAME1 Yarrow +#define POOL_NAMEU1 YarrowPool +#define POOL_NAMEL1 yarrowpool #define PRNG_ISAAC 1 #define PRNG_X917 2 -- 2.25.1