webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-05-27 08:35:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Harmonizing coding style.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2023-02-14 23:11:51 +01:00
parent 31e66007d3
commit 12bdcbd1f9
30 changed files with 1475 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/rng/hwrng.c
View File

@@ -36,7 +36,8 @@ mbedtls_ctr_drbg_context ctr_drbg;
extern uint32_t board_millis();
#endif
void adc_start() {
void adc_start()
{
#ifndef ENABLE_EMULATION
adc_init();
adc_gpio_init(27);
@@ -44,10 +45,12 @@ void adc_start() {
#endif
}
void adc_stop() {
void adc_stop()
{
}
#ifdef ENABLE_EMULATION
uint32_t adc_read() {
uint32_t adc_read()
{
return 0;
}
#endif
@@ -55,19 +58,25 @@ uint32_t adc_read() {
static uint64_t random_word = 0xcbf29ce484222325;
static uint8_t ep_round = 0;
static void ep_init() {
static void ep_init()
{
random_word = 0xcbf29ce484222325;
ep_round = 0;
#ifdef ENABLE_EMULATION
mbedtls_entropy_context entropy;
mbedtls_entropy_init( &entropy );
mbedtls_ctr_drbg_init( &ctr_drbg );
mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char *) "RANDOM_GEN", 10 );
mbedtls_entropy_init(&entropy);
mbedtls_ctr_drbg_init(&ctr_drbg);
mbedtls_ctr_drbg_seed(&ctr_drbg,
mbedtls_entropy_func,
&entropy,
(const unsigned char *) "RANDOM_GEN",
10);
#endif
}
/* Here, we assume a little endian architecture. */
static int ep_process () {
static int ep_process()
{
if (ep_round == 0) {
ep_init();
}
@@ -75,16 +84,15 @@ static int ep_process () {
#ifndef ENABLE_EMULATION
for (int n = 0; n < 64; n++) {
uint8_t bit1, bit2;
do
{
do {
bit1 = rosc_hw->randombit&0xff;
//sleep_ms(1);
bit2 = rosc_hw->randombit&0xff;
} while(bit1 == bit2);
} while (bit1 == bit2);
word = (word << 1) | bit1;
}
#else
mbedtls_ctr_drbg_random( &ctr_drbg, (uint8_t *)&word, sizeof( word ) );
mbedtls_ctr_drbg_random(&ctr_drbg, (uint8_t *) &word, sizeof(word));
#endif
random_word ^= word^board_millis()^adc_read();
random_word *= 0x00000100000001B3;
@@ -95,19 +103,21 @@ static int ep_process () {
return 0;
}
static const uint32_t *ep_output() {
return (uint32_t *)&random_word;
static const uint32_t *ep_output()
{
return (uint32_t *) &random_word;
}
struct rng_rb {
uint32_t *buf;
uint8_t head, tail;
uint8_t size;
unsigned int full :1;
unsigned int empty :1;
unsigned int full : 1;
unsigned int empty : 1;
};
static void rb_init(struct rng_rb *rb, uint32_t *p, uint8_t size) {
static void rb_init(struct rng_rb *rb, uint32_t *p, uint8_t size)
{
#ifdef ENABLE_EMULATION
#endif
rb->buf = p;
@@ -117,22 +127,28 @@ static void rb_init(struct rng_rb *rb, uint32_t *p, uint8_t size) {
rb->empty = 1;
}
static void rb_add(struct rng_rb *rb, uint32_t v) {
static void rb_add(struct rng_rb *rb, uint32_t v)
{
rb->buf[rb->tail++] = v;
if (rb->tail == rb->size)
if (rb->tail == rb->size) {
rb->tail = 0;
if (rb->tail == rb->head)
}
if (rb->tail == rb->head) {
rb->full = 1;
}
rb->empty = 0;
}
static uint32_t rb_del(struct rng_rb *rb) {
static uint32_t rb_del(struct rng_rb *rb)
{
uint32_t v = rb->buf[rb->head++];
if (rb->head == rb->size)
if (rb->head == rb->size) {
rb->head = 0;
if (rb->head == rb->tail)
}
if (rb->head == rb->tail) {
rb->empty = 1;
}
rb->full = 0;
return v;
@@ -140,26 +156,29 @@ static uint32_t rb_del(struct rng_rb *rb) {
static struct rng_rb the_ring_buffer;
void *neug_task() {
void *neug_task()
{
struct rng_rb *rb = &the_ring_buffer;
int n;
if ((n = ep_process())) {
int i;
const uint32_t *vp;
vp = ep_output();
int i;
const uint32_t *vp;
vp = ep_output();
for (i = 0; i < n; i++) {
rb_add (rb, *vp++);
if (rb->full)
break;
}
}
for (i = 0; i < n; i++) {
rb_add(rb, *vp++);
if (rb->full) {
break;
}
}
}
return NULL;
}
void neug_init(uint32_t *buf, uint8_t size) {
void neug_init(uint32_t *buf, uint8_t size)
{
struct rng_rb *rb = &the_ring_buffer;
rb_init(rb, buf, size);
@@ -169,40 +188,45 @@ void neug_init(uint32_t *buf, uint8_t size) {
ep_init();
}
void neug_flush(void) {
void neug_flush(void)
{
struct rng_rb *rb = &the_ring_buffer;
while (!rb->empty)
rb_del (rb);
while (!rb->empty) {
rb_del(rb);
}
}
uint32_t neug_get() {
uint32_t neug_get()
{
struct rng_rb *rb = &the_ring_buffer;
uint32_t v;
while (rb->empty)
while (rb->empty) {
neug_task();
}
v = rb_del(rb);
return v;
}
void neug_wait_full() {
void neug_wait_full()
{
struct rng_rb *rb = &the_ring_buffer;
#ifndef ENABLE_EMULATION
uint core = get_core_num();
#endif
while (!rb->full) {
#ifndef ENABLE_EMULATION
if (core == 1)
if (core == 1) {
sleep_ms(1);
else
} else
#endif
neug_task();
neug_task();
}
}
void neug_fini(void) {
void neug_fini(void)
{
neug_get();
}

2
src/rng/hwrng.h
View File

@@ -31,4 +31,4 @@ void neug_flush(void);
void neug_wait_full();
void neug_fini(void);
#endif
#endif

60
src/rng/random.c
View File

@@ -22,43 +22,49 @@
#include "hwrng.h"
#define RANDOM_BYTES_LENGTH 32
static uint32_t random_word[RANDOM_BYTES_LENGTH/sizeof (uint32_t)];
static uint32_t random_word[RANDOM_BYTES_LENGTH/sizeof(uint32_t)];
void random_init(void) {
void random_init(void)
{
int i;
neug_init(random_word, RANDOM_BYTES_LENGTH/sizeof (uint32_t));
neug_init(random_word, RANDOM_BYTES_LENGTH/sizeof(uint32_t));
for (i = 0; i < NEUG_PRE_LOOP; i++)
for (i = 0; i < NEUG_PRE_LOOP; i++) {
neug_get();
}
}
void random_fini(void) {
neug_fini ();
void random_fini(void)
{
neug_fini();
}
/*
* Return pointer to random 32-byte
*/
void random_bytes_free (const uint8_t *p);
void random_bytes_free(const uint8_t *p);
#define MAX_RANDOM_BUFFER 1024
const uint8_t * random_bytes_get(size_t len) {
if (len > MAX_RANDOM_BUFFER)
const uint8_t *random_bytes_get(size_t len)
{
if (len > MAX_RANDOM_BUFFER) {
return NULL;
}
static uint32_t return_word[MAX_RANDOM_BUFFER/sizeof(uint32_t)];
for (int ix = 0; ix < len; ix += RANDOM_BYTES_LENGTH) {
neug_wait_full();
memcpy(return_word+ix/sizeof(uint32_t), random_word, RANDOM_BYTES_LENGTH);
random_bytes_free((const uint8_t *)random_word);
random_bytes_free((const uint8_t *) random_word);
}
return (const uint8_t *)return_word;
return (const uint8_t *) return_word;
}
/*
* Free pointer to random 32-byte
*/
void random_bytes_free(const uint8_t *p) {
(void)p;
void random_bytes_free(const uint8_t *p)
{
(void) p;
memset(random_word, 0, RANDOM_BYTES_LENGTH);
neug_flush();
}
@@ -66,21 +72,23 @@ void random_bytes_free(const uint8_t *p) {
/*
* Return 4-byte salt
*/
void random_get_salt(uint8_t *p) {
void random_get_salt(uint8_t *p)
{
uint32_t rnd;
rnd = neug_get();
memcpy(p, &rnd, sizeof (uint32_t));
memcpy(p, &rnd, sizeof(uint32_t));
rnd = neug_get();
memcpy(p + sizeof (uint32_t), &rnd, sizeof (uint32_t));
memcpy(p + sizeof(uint32_t), &rnd, sizeof(uint32_t));
}
/*
* Random byte iterator
*/
int random_gen(void *arg, unsigned char *out, size_t out_len) {
uint8_t *index_p = (uint8_t *)arg;
int random_gen(void *arg, unsigned char *out, size_t out_len)
{
uint8_t *index_p = (uint8_t *) arg;
uint8_t index = index_p ? *index_p : 0;
size_t n;
@@ -88,22 +96,24 @@ int random_gen(void *arg, unsigned char *out, size_t out_len) {
neug_wait_full();
n = RANDOM_BYTES_LENGTH - index;
if (n > out_len)
n = out_len;
if (n > out_len) {
n = out_len;
}
memcpy(out, ((unsigned char *)random_word) + index, n);
memcpy(out, ((unsigned char *) random_word) + index, n);
out += n;
out_len -= n;
index += n;
if (index >= RANDOM_BYTES_LENGTH) {
index = 0;
neug_flush();
}
index = 0;
neug_flush();
}
}
if (index_p)
if (index_p) {
*index_p = index;
}
return 0;
}

12
src/rng/random.h
View File

@@ -25,17 +25,17 @@
#include "pico/stdlib.h"
#endif
void random_init (void);
void random_fini (void);
void random_init(void);
void random_fini(void);
/* 32-byte random bytes */
const uint8_t *random_bytes_get (size_t);
void random_bytes_free (const uint8_t *p);
const uint8_t *random_bytes_get(size_t);
void random_bytes_free(const uint8_t *p);
/* 8-byte salt */
void random_get_salt (uint8_t *p);
void random_get_salt(uint8_t *p);
/* iterator returning a byta at a time */
extern int random_gen(void *arg, unsigned char *output, size_t output_len);
#endif
#endif