mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

sha256: replace gettimeofday()

Browse Source 
gettimeofday() is not portable. I suspect os_hrtime() is also better as a
seed than gettimeofday() or time() were.
This commit is contained in:
Nicolas Hillegeer
2014-07-21 15:27:56 +02:00
parent 6cbda2cbf6
commit 8ec0aef307
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/sha256.c
View File

@@ -15,10 +15,10 @@
#include <inttypes.h> #include <inttypes.h>
#include <string.h> #include <string.h>
#include "nvim/os/time.h"
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/sha256.h" #include "nvim/sha256.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "sha256.c.generated.h" # include "sha256.c.generated.h"
#endif #endif
@@ -350,21 +350,6 @@ int sha256_self_test(void)
return failures > 0 ? FAIL : OK; return failures > 0 ? FAIL : OK;
} }
static unsigned int get_some_time(void)
{
#ifdef HAVE_GETTIMEOFDAY
struct timeval tv;
// Using usec makes it less predictable.
gettimeofday(&tv, NULL);
return (unsigned int) (tv.tv_sec + tv.tv_usec);
#else // ifdef HAVE_GETTIMEOFDAY
return (unsigned int) time(NULL);
#endif // ifdef HAVE_GETTIMEOFDAY
}
/// Fill "header[header_len]" with random_data. /// Fill "header[header_len]" with random_data.
/// Also "salt[salt_len]" when "salt" is not NULL. /// Also "salt[salt_len]" when "salt" is not NULL.
/// ///
@@ -378,11 +363,11 @@ void sha2_seed(char_u *header, int header_len, char_u *salt, int salt_len)
char_u sha256sum[32]; char_u sha256sum[32];
context_sha256_T ctx; context_sha256_T ctx;
srand(get_some_time()); srand((unsigned int) os_hrtime());
int i; int i;
for (i = 0; i < (int) sizeof(random_data) - 1; i++) { for (i = 0; i < (int) sizeof(random_data) - 1; i++) {
random_data[i] = (char_u) ((get_some_time() ^ rand()) & 0xff); random_data[i] = (char_u) ((os_hrtime() ^ rand()) & 0xff);
} }
sha256_start(&ctx); sha256_start(&ctx);
sha256_update(&ctx, (char_u *) random_data, sizeof(random_data)); sha256_update(&ctx, (char_u *) random_data, sizeof(random_data));