OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix random_pool.c:214:13: error: conflicting types for 'getentropy' 

214 | static void getentropy(FAR blake2s_state *S)
       |             ^~~~~~~~~~
 In file included from /home/work/ssd1/workspace/MiRTOS-CI@2/out/miwear/ap/.unionfs/nuttx/include/nuttx/mutex.h:31,
                  from random_pool.c:37:
 /home/work/ssd1/workspace/MiRTOS-CI@2/out/miwear/ap/.unionfs/nuttx/include/unistd.h:428:9: note: previous declaration of 'getentropy' was here
   428 | int     getentropy(FAR void *buffer, size_t length);
       |         ^~~~~~~~~~

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-10-21 04:11:00 +08:00 committed by Petro Karashchenko
parent e91e144fb6
commit d0bd68b35e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/random_pool.c
View File

@ -189,7 +189,7 @@ static void addentropy(FAR const uint32_t *buf, size_t n, bool inc_new)
}
/****************************************************************************
* Name: getentropy
* Name: initentropy
*
* Description:
* Hash entropy pool to BLAKE2s context. This is an internal interface for
@ -211,7 +211,7 @@ static void addentropy(FAR const uint32_t *buf, size_t n, bool inc_new)
*
****************************************************************************/
static void getentropy(FAR blake2s_state *S)
static void initentropy(FAR blake2s_state *S)
{
#ifdef CONFIG_SCHED_CPULOAD
struct cpuload_s load;
@ -281,7 +281,7 @@ static void rng_reseed(void)
/* Initialize with randomness from entropy pool */
getentropy(&g_rng.blake2xs.ctx);
initentropy(&g_rng.blake2xs.ctx);
/* Absorb also the previous root */