minhtrannhat/os161
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.ops-class.org:staff/os161

Browse Source
This commit is contained in:
Guru Prasad Srinivasa 2016-03-01 15:31:47 -05:00
commit 5a48788226
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/libtest161/secure.c
View File

@ -40,6 +40,8 @@ static int buf_num = 0;
#ifndef _KERNEL #ifndef _KERNEL
static int did_random = 0; static int did_random = 0;
#define NSEC_PER_MSEC 1000000ULL
#define MSEC_PER_SEC 1000ULL
#endif #endif
static void * _alloc(size_t size) static void * _alloc(size_t size)
@ -143,9 +145,14 @@ static void make_salt(char *salt_str)
#ifndef _KERNEL #ifndef _KERNEL
if (!did_random) { if (!did_random) {
did_random = 1; did_random = 1;
time_t t; time_t sec;
time(&t); unsigned long ns;
srandom(t); unsigned long long ms;
__time(&sec, &ns);
ms = (unsigned long long)sec * MSEC_PER_SEC;
ms += (ns / NSEC_PER_MSEC);
srandom((unsigned long)ms);
} }
#endif #endif