ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-24 02:24:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dillbo

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2015-03-19 11:55:58 -07:00
commit e04378b8fa
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -33,7 +33,7 @@ ENDIAN=little
#
BIN=bin
LIB=$(PWD)/urb
LIB=$(shell pwd)/urb
RM=rm -f
CC=gcc

9
i/c/portable.h
View File

@ -178,3 +178,12 @@
# else
# error "port: timeconvert"
# endif
/* Entropy
*/
# if defined(U3_OS_bsd) && defined(__OpenBSD__)
# define c3_rand(rd) (getentropy((void*)rd, 32) == 0 ? \
(void)0 : c3_assert(!"ent"))
# else
# define c3_rand u3_sist_rand
# endif

5
i/v/vere.h
View File

@ -1094,6 +1094,11 @@
void
u3_sist_get(const c3_c* key_c, c3_y* val_y);
/* u3_sist_rand(): fill 8 words (32 bytes) with high-quality entropy.
*/
void
u3_sist_rand(c3_w* rad_w);
/** New timer system.
**/
/* u3_temp_io_init(): initialize time timer.

12
v/sist.c
View File

@ -444,10 +444,10 @@ _sist_bask(c3_c* pop_c, u3_noun may)
}
#endif
/* _sist_rand(): fill a 256-bit (8-word) buffer.
/* u3_sist_rand(): fill a 256-bit (8-word) buffer.
*/
static void
_sist_rand(c3_w* rad_w)
void
u3_sist_rand(c3_w* rad_w)
{
c3_i fid_i = open(DEVRANDOM, O_RDONLY);
@ -589,7 +589,7 @@ _sist_zest()
{
c3_w rad_w[8];
_sist_rand(rad_w);
c3_rand(rad_w);
sal_l = (0x7fffffff & rad_w[0]);
}
@ -599,7 +599,7 @@ _sist_zest()
c3_w rad_w[8];
u3_noun pas;
_sist_rand(rad_w);
c3_rand(rad_w);
pas = u3i_words(2, rad_w);
u3A->key = _sist_fatt(sal_l, u3k(pas));
@ -1201,7 +1201,7 @@ _sist_zen()
{
c3_w rad_w[8];
_sist_rand(rad_w);
c3_rand(rad_w);
return u3i_words(8, rad_w);
}