generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-10-15 07:14:50 +02:00
Code Issues Projects Releases Wiki Activity

Use stdint integer types instead of BSD legacy ones

Browse Source
This commit is contained in:
Guillem Jover
2014-08-12 12:32:34 +02:00
parent 6378351169
commit 02b55488c5
7 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/arc4random.c
View File

@@ -43,9 +43,9 @@ __FBSDID("$FreeBSD$");
#include <pthread.h>
struct arc4_stream {
u_int8_t i;
u_int8_t j;
u_int8_t s[256];
uint8_t i;
uint8_t j;
uint8_t s[256];
};
#define RANDOMDEV "/dev/urandom"
@@ -65,7 +65,7 @@ static int rs_initialized;
static int rs_stired;
static int arc4_count;
static inline u_int8_t arc4_getbyte(void);
static inline uint8_t arc4_getbyte(void);
static void arc4_stir(void);
static inline void
@@ -83,7 +83,7 @@ static inline void
arc4_addrandom(u_char *dat, int datlen)
{
int n;
u_int8_t si;
uint8_t si;
rs.i--;
for (n = 0; n < 256; n++) {
@@ -103,7 +103,7 @@ arc4_stir(void)
struct {
struct timeval tv;
pid_t pid;
u_int8_t rnd[KEYSIZE];
uint8_t rnd[KEYSIZE];
} rdat;
fd = open(RANDOMDEV, O_RDONLY, 0);
@@ -133,10 +133,10 @@ arc4_stir(void)
arc4_count = 1600000;
}
static inline u_int8_t
static inline uint8_t
arc4_getbyte(void)
{
u_int8_t si, sj;
uint8_t si, sj;
rs.i = (rs.i + 1);
si = rs.s[rs.i];
@@ -148,10 +148,10 @@ arc4_getbyte(void)
return (rs.s[(si + sj) & 0xff]);
}
static inline u_int32_t
static inline uint32_t
arc4_getword(void)
{
u_int32_t val;
uint32_t val;
val = arc4_getbyte() << 24;
val |= arc4_getbyte() << 16;
@@ -199,10 +199,10 @@ arc4random_addrandom(u_char *dat, int datlen)
THREAD_UNLOCK();
}
u_int32_t
uint32_t
arc4random(void)
{
u_int32_t rnd;
uint32_t rnd;
THREAD_LOCK();
arc4_check_init();
@@ -239,10 +239,10 @@ arc4random_buf(void *_buf, size_t n)
* [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
* after reduction modulo upper_bound.
*/
u_int32_t
arc4random_uniform(u_int32_t upper_bound)
uint32_t
arc4random_uniform(uint32_t upper_bound)
{
u_int32_t r, min;
uint32_t r, min;
if (upper_bound < 2)
return (0);