Attempting to add support to esp32s3.

Will it work? Who knows...

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

src/rng/hwrng.c

@@ -18,7 +18,17 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
-#ifndef ENABLE_EMULATION
+#if defined(ENABLE_EMULATION)
+#include "mbedtls/entropy.h"
+#include "mbedtls/ctr_drbg.h"
+
+mbedtls_ctr_drbg_context ctr_drbg;
+extern uint32_t board_millis();
+#elif (ESP_PLATFORM)
+#include "bootloader_random.h"
+#include "esp_random.h"
+#include "esp_compat.h"
+#else
 #include "pico/stdlib.h"
 
 #include "hwrng.h"
@@ -28,16 +38,13 @@
 #include "bsp/board.h"
 
 #include "pico/time.h"
-#else
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
-
-mbedtls_ctr_drbg_context ctr_drbg;
-extern uint32_t board_millis();
 #endif
 
 void adc_start() {
-#ifndef ENABLE_EMULATION
+#if defined(ENABLE_EMULATION)
+#elif defined(ESP_PLATFORM)
+    bootloader_random_enable();
+#else
     adc_init();
     adc_gpio_init(27);
     adc_select_input(1);
@@ -46,7 +53,7 @@ void adc_start() {
 
 void adc_stop() {
 }
-#ifdef ENABLE_EMULATION
+#if defined(ENABLE_EMULATION) || defined(ESP_PLATFORM)
 uint32_t adc_read() {
     return 0;
 }
@@ -76,7 +83,12 @@ static int ep_process() {
         ep_init();
     }
     uint64_t word = 0x0;
-#ifndef ENABLE_EMULATION
+
+#if defined(ENABLE_EMULATION)
+    mbedtls_ctr_drbg_random(&ctr_drbg, (uint8_t *) &word, sizeof(word));
+#elif defined(ESP_PLATFORM)
+    esp_fill_random((uint8_t *)&word, sizeof(word));
+#else
     for (int n = 0; n < 64; n++) {
         uint8_t bit1, bit2;
         do {
@@ -86,8 +98,6 @@ static int ep_process() {
         } while (bit1 == bit2);
         word = (word << 1) | bit1;
     }
-#else
-    mbedtls_ctr_drbg_random(&ctr_drbg, (uint8_t *) &word, sizeof(word));
 #endif
     random_word ^= word ^ board_millis() ^ adc_read();
     random_word *= 0x00000100000001B3;
@@ -200,7 +210,11 @@ uint32_t neug_get() {
 void neug_wait_full() {
     struct rng_rb *rb = &the_ring_buffer;
 #ifndef ENABLE_EMULATION
+#ifdef ESP_PLATFORM
+    uint8_t core = xTaskGetCurrentTaskHandle() == hcore1 ? 1 : 0;
+#else
     uint core = get_core_num();
+#endif
 #endif
     while (!rb->full) {
 #ifndef ENABLE_EMULATION

src/rng/hwrng.h

@@ -21,7 +21,7 @@
 #define NEUG_PRE_LOOP 32
 
 #include <stdlib.h>
-#ifndef ENABLE_EMULATION
+#if !defined(ENABLE_EMULATION) && !defined(ESP_PLATFORM)
 #include "pico/stdlib.h"
 #endif
 

src/rng/random.c

@@ -65,18 +65,6 @@ void random_bytes_free(const uint8_t *p) {
     neug_flush();
 }
 
-/*
- * Return 4-byte salt
- */
-void random_get_salt(uint8_t *p) {
-    uint32_t rnd;
-
-    rnd = neug_get();
-    memcpy(p, &rnd, sizeof(uint32_t));
-    rnd = neug_get();
-    memcpy(p + sizeof(uint32_t), &rnd, sizeof(uint32_t));
-}
-
 
 /*
  * Random byte iterator

src/rng/random.h

@@ -32,9 +32,6 @@ void random_fini(void);
 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);
-
 /* iterator returning a byta at a time */
 extern int random_gen(void *arg, unsigned char *output, size_t output_len);