webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-05-28 09:01:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename methods for better description

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2026-01-12 00:09:29 +01:00
parent 8a0ef0b30c
commit 8412727e03
4 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@@ -247,7 +247,7 @@ void init_rtc() {
#endif #endif
} }
extern void neug_task(); extern void hwrng_task();
extern void usb_task(); extern void usb_task();
void execute_tasks() void execute_tasks()
{ {
@@ -261,7 +261,7 @@ void execute_tasks()
void core0_loop() { void core0_loop() {
while (1) { while (1) {
execute_tasks(); execute_tasks();
neug_task(); hwrng_task();
do_flash(); do_flash();
#ifndef ENABLE_EMULATION #ifndef ENABLE_EMULATION
if (button_pressed_cb && board_millis() > 1000 && !is_busy()) { // wait 1 second to boot up if (button_pressed_cb && board_millis() > 1000 && !is_busy()) { // wait 1 second to boot up

68
src/rng/hwrng.c
View File

@@ -44,17 +44,17 @@ void hwrng_start() {
} }
static uint64_t random_word = 0xcbf29ce484222325; static uint64_t random_word = 0xcbf29ce484222325;
static uint8_t ep_round = 0; static uint8_t hwrng_mix_round = 0;
static void ep_init() { static void hwrng_mix_init() {
random_word = 0xcbf29ce484222325; random_word = 0xcbf29ce484222325;
ep_round = 0; hwrng_mix_round = 0;
} }
/* Here, we assume a little endian architecture. */ /* Here, we assume a little endian architecture. */
static int ep_process() { static int hwrng_mix_process() {
if (ep_round == 0) { if (hwrng_mix_round == 0) {
ep_init(); hwrng_mix_init();
} }
uint64_t word = 0x0; uint64_t word = 0x0;
@@ -69,14 +69,14 @@ static int ep_process() {
#endif #endif
random_word ^= word ^ board_millis(); random_word ^= word ^ board_millis();
random_word *= 0x00000100000001B3; random_word *= 0x00000100000001B3;
if (++ep_round == 8) { if (++hwrng_mix_round == 8) {
ep_round = 0; hwrng_mix_round = 0;
return 2; //2 words return sizeof(uint64_t) / sizeof(uint32_t); //2 words
} }
return 0; return 0;
} }
struct rng_rb { struct hwrng_buf {
uint32_t *buf; uint32_t *buf;
uint8_t head, tail; uint8_t head, tail;
uint8_t size; uint8_t size;
@@ -84,7 +84,7 @@ struct rng_rb {
unsigned int empty : 1; unsigned int empty : 1;
}; };
static void rb_init(struct rng_rb *rb, uint32_t *p, uint8_t size) { static void hwrng_buf_init(struct hwrng_buf *rb, uint32_t *p, uint8_t size) {
rb->buf = p; rb->buf = p;
rb->size = size; rb->size = size;
rb->head = rb->tail = 0; rb->head = rb->tail = 0;
@@ -92,7 +92,7 @@ static void rb_init(struct rng_rb *rb, uint32_t *p, uint8_t size) {
rb->empty = 1; rb->empty = 1;
} }
static void rb_add(struct rng_rb *rb, uint32_t v) { static void hwrng_buf_add(struct hwrng_buf *rb, uint32_t v) {
rb->buf[rb->tail++] = v; rb->buf[rb->tail++] = v;
if (rb->tail == rb->size) { if (rb->tail == rb->size) {
rb->tail = 0; rb->tail = 0;
@@ -103,7 +103,7 @@ static void rb_add(struct rng_rb *rb, uint32_t v) {
rb->empty = 0; rb->empty = 0;
} }
static uint32_t rb_del(struct rng_rb *rb) { static uint32_t hwrng_buf_del(struct hwrng_buf *rb) {
uint32_t v = rb->buf[rb->head++]; uint32_t v = rb->buf[rb->head++];
if (rb->head == rb->size) { if (rb->head == rb->size) {
@@ -117,19 +117,18 @@ static uint32_t rb_del(struct rng_rb *rb) {
return v; return v;
} }
static struct rng_rb the_ring_buffer; static struct hwrng_buf ring_buffer;
void *neug_task() { void *hwrng_task() {
struct rng_rb *rb = &the_ring_buffer; struct hwrng_buf *rb = &ring_buffer;
int n; int n;
if ((n = ep_process())) { if ((n = hwrng_mix_process())) {
int i;
const uint32_t *vp = (const uint32_t *) &random_word; const uint32_t *vp = (const uint32_t *) &random_word;
for (i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
rb_add(rb, *vp++); hwrng_buf_add(rb, *vp++);
if (rb->full) { if (rb->full) {
break; break;
} }
@@ -138,38 +137,37 @@ void *neug_task() {
return NULL; return NULL;
} }
void neug_init(uint32_t *buf, uint8_t size) { void hwrng_init(uint32_t *buf, uint8_t size) {
struct rng_rb *rb = &the_ring_buffer; struct hwrng_buf *rb = &ring_buffer;
rb_init(rb, buf, size); hwrng_buf_init(rb, buf, size);
hwrng_start(); hwrng_start();
ep_init(); hwrng_mix_init();
} }
void neug_flush(void) { void hwrng_flush(void) {
struct rng_rb *rb = &the_ring_buffer; struct hwrng_buf *rb = &ring_buffer;
while (!rb->empty) { while (!rb->empty) {
rb_del(rb); hwrng_buf_del(rb);
} }
} }
uint32_t neug_get() { uint32_t hwrng_get() {
struct rng_rb *rb = &the_ring_buffer; struct hwrng_buf *rb = &ring_buffer;
uint32_t v; uint32_t v;
while (rb->empty) { while (rb->empty) {
neug_task(); hwrng_task();
} }
v = rb_del(rb); v = hwrng_buf_del(rb);
return v; return v;
} }
void neug_wait_full() { void hwrng_wait_full() {
struct rng_rb *rb = &the_ring_buffer; struct hwrng_buf *rb = &ring_buffer;
#ifdef ESP_PLATFORM #ifdef ESP_PLATFORM
uint8_t core = xTaskGetCurrentTaskHandle() == hcore1 ? 1 : 0; uint8_t core = xTaskGetCurrentTaskHandle() == hcore1 ? 1 : 0;
#elif defined(PICO_PLATFORM) #elif defined(PICO_PLATFORM)
@@ -182,6 +180,6 @@ void neug_wait_full() {
} }
else else
#endif #endif
neug_task(); hwrng_task();
} }
} }

16
src/rng/hwrng.h
View File

@@ -17,17 +17,11 @@
#ifndef _NEUG_H_ #ifndef _NEUG_H_
#define _NEUG_H_ #define _NEUG_H_
#include <stdint.h>
#define NEUG_PRE_LOOP 32 void hwrng_init(uint32_t *buf, uint8_t size);
uint32_t hwrng_get();
#include <stdlib.h> void hwrng_flush(void);
#if defined(PICO_PLATFORM) void hwrng_wait_full();
#include "pico/stdlib.h"
#endif
void neug_init(uint32_t *buf, uint8_t size);
uint32_t neug_get();
void neug_flush(void);
void neug_wait_full();
#endif #endif

60
src/rng/random.c
View File

@@ -15,8 +15,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#define HWRNG_PRE_LOOP 32
#include <stdint.h> #include <stdlib.h>
#if defined(PICO_PLATFORM)
#include "pico/stdlib.h"
#endif
#include <string.h> #include <string.h>
#include "hwrng.h" #include "hwrng.h"
@@ -25,42 +29,38 @@
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; hwrng_init(random_word, RANDOM_BYTES_LENGTH / sizeof(uint32_t));
neug_init(random_word, RANDOM_BYTES_LENGTH / sizeof(uint32_t)); for (int i = 0; i < HWRNG_PRE_LOOP; i++) {
hwrng_get();
for (i = 0; i < NEUG_PRE_LOOP; i++) {
neug_get();
} }
} }
/*
* Return pointer to random 32-byte
*/
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) {
return NULL;
}
static uint32_t return_word[MAX_RANDOM_BUFFER / sizeof(uint32_t)];
for (size_t 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);
}
return (const uint8_t *) return_word;
}
/* /*
* Free pointer to random 32-byte * Free pointer to random 32-byte
*/ */
void random_bytes_free(const uint8_t *p) { void random_bytes_free(const uint8_t *p) {
(void) p; (void) p;
memset(random_word, 0, RANDOM_BYTES_LENGTH); memset(random_word, 0, RANDOM_BYTES_LENGTH);
neug_flush(); hwrng_flush();
} }
/*
* Return pointer to random 32-byte
*/
#define MAX_RANDOM_BUFFER 1024
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 (size_t ix = 0; ix < len; ix += RANDOM_BYTES_LENGTH) {
hwrng_wait_full();
memcpy(return_word + ix / sizeof(uint32_t), random_word, RANDOM_BYTES_LENGTH);
random_bytes_free((const uint8_t *) random_word);
}
return (const uint8_t *) return_word;
}
/* /*
* Random byte iterator * Random byte iterator
@@ -71,7 +71,7 @@ int random_gen(void *arg, unsigned char *out, size_t out_len) {
uint8_t n; uint8_t n;
while (out_len) { while (out_len) {
neug_wait_full(); hwrng_wait_full();
n = RANDOM_BYTES_LENGTH - index; n = RANDOM_BYTES_LENGTH - index;
if (n > out_len) { if (n > out_len) {
@@ -85,7 +85,7 @@ int random_gen(void *arg, unsigned char *out, size_t out_len) {
if (index >= RANDOM_BYTES_LENGTH) { if (index >= RANDOM_BYTES_LENGTH) {
index = 0; index = 0;
neug_flush(); hwrng_flush();
} }
} }
@@ -95,3 +95,9 @@ int random_gen(void *arg, unsigned char *out, size_t out_len) {
return 0; return 0;
} }
#ifdef ENABLE_PQC
void randombytes(uint8_t *buf, size_t n) {
random_gen(NULL, buf, n);
}
#endif