gitback/pico-sdk
1
0
Fork 0
mirror of https://github.com/raspberrypi/pico-sdk.git synced 2024-09-29 03:28:49 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

rename get_rand_xx to rand_xx, minor bug fix

Browse Source
This commit is contained in:
graham sanderson 2023-02-16 09:57:09 -06:00
parent 00b89607a6
commit 52ee8e6821
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rp2_common/pico_mbedtls/pico_mbedtls.c
View File

@ -6,7 +6,7 @@
int mbedtls_hardware_poll(void *data __unused, unsigned char *output, size_t len, size_t *olen) {
*olen = 0;
while(*olen < len) {
uint64_t rand_data = get_rand_64();
uint64_t rand_data = rand_64();
size_t to_copy = MIN(len, sizeof(rand_data));
memcpy(output + *olen, &rand_data, to_copy);
*olen += to_copy;

13
src/rp2_common/pico_rand/include/pico/rand.h
View File

@ -156,7 +156,9 @@ typedef struct rng_128 {
*
* \param rand128 Pointer to storage to accept a 128-bit random number
*/
void get_rand_128(rng_128_t *rand128);
void rand_128(rng_128_t *rand128);
// for backwards compatibility with 1.5.0
#define get_rand_128 rand_128
/*! \brief Get 64-bit random number
* \ingroup pico_rand
@ -166,7 +168,9 @@ void get_rand_128(rng_128_t *rand128);
*
* \return 64-bit random number
*/
uint64_t get_rand_64(void);
uint64_t rand_64(void);
// for backwards compatibility with 1.5.0
#define get_rand_64 rand_64
/*! \brief Get 32-bit random number
* \ingroup pico_rand
@ -176,7 +180,9 @@ uint64_t get_rand_64(void);
*
* \return 32-bit random number
*/
uint32_t get_rand_32(void);
uint32_t rand_32(void);
// for backwards compatibility with 1.5.0
#define get_rand_32 rand_32
/*! \brief Add entropy to the random number generator
* \ingroup pico_rand
@ -187,6 +193,7 @@ uint32_t get_rand_32(void);
* \param entropy_len the number of bytes of entropy in the entropy buffer
*/
void rand_add_entropy(const uint8_t *entropy, uint entropy_len);
#ifdef __cplusplus
}
#endif

18
src/rp2_common/pico_rand/rand.c
View File

@ -175,8 +175,8 @@ static uint64_t capture_additional_rosc_samples(uint n) {
}
#endif
static void initialise_rand(void) {
rng_128_t local_rng_state = local_rng_state;
static void initialize_rand(void) {
rng_128_t local_rng_state = rng_state;
uint which = 0;
#if PICO_RAND_SEED_ENTROPY_SRC_RAM_HASH
ram_hash = sdbm_hash64_sram(ram_hash);
@ -247,12 +247,12 @@ static void initialise_rand(void) {
spin_unlock(lock, save);
}
uint64_t get_rand_64(void) {
uint64_t rand_64(void) {
if (!rng_initialised) {
// Do not provide 'RNs' until the system has been initialised. Note:
// The first initialisation can be quite time-consuming depending on
// the amount of RAM hashed, see RAM_HASH_START and RAM_HASH_END
initialise_rand();
initialize_rand();
}
rng_128_t local_rng_state = rng_state;
@ -295,13 +295,13 @@ uint64_t get_rand_64(void) {
return rand64;
}
void get_rand_128(rng_128_t *ptr128) {
ptr128->r[0] = get_rand_64();
ptr128->r[1] = get_rand_64();
void rand_128(rng_128_t *rand128) {
rand128->r[0] = rand_64();
rand128->r[1] = rand_64();
}
uint32_t get_rand_32(void) {
return (uint32_t) get_rand_64();
uint32_t rand_32(void) {
return (uint32_t) rand_64();
}
void rand_add_entropy(const uint8_t *entropy, uint entropy_len) {