ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a workaround in encryption loops calculation for CPUs no longer keeping up with Moore's law

Browse source
This commit is contained in:
Con Kolivas 2016-06-14 13:47:38 +10:00
parent 23ff5f921a
commit 3d9b791214
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lrzip.c
View file

@ -1271,7 +1271,7 @@ error:
bool initialise_control(rzip_control *control) bool initialise_control(rzip_control *control)
{ {
struct timeval tv; time_t now_t, tdiff;
char *eptr; /* for environment */ char *eptr; /* for environment */
memset(control, 0, sizeof(rzip_control)); memset(control, 0, sizeof(rzip_control));
@ -1292,9 +1292,17 @@ bool initialise_control(rzip_control *control)
/* The first 5 bytes of the salt is the time in seconds. /* The first 5 bytes of the salt is the time in seconds.
* The next 2 bytes encode how many times to hash the password. * The next 2 bytes encode how many times to hash the password.
* The last 9 bytes are random data, making 16 bytes of salt */ * The last 9 bytes are random data, making 16 bytes of salt */
if (unlikely(gettimeofday(&tv, NULL))) if (unlikely((now_t = time(NULL)) == ((time_t)-1)))
fatal_return(("Failed to gettimeofday in main\n"), false); fatal_return(("Failed to call time in main\n"), false);
control->secs = tv.tv_sec; if (unlikely(now_t < T_ZERO)) {
print_output("Warning your time reads before the year 2011, check your system clock\n");
now_t = T_ZERO;
}
/* Workaround for CPUs no longer keeping up with Moore's law!
* This way we keep the magic header format unchanged. */
tdiff = (now_t - T_ZERO) / 4;
now_t = T_ZERO + tdiff;
control->secs = now_t;
control->encloops = nloops(control->secs, control->salt, control->salt + 1); control->encloops = nloops(control->secs, control->salt, control->salt + 1);
if (unlikely(!get_rand(control, control->salt + 2, 6))) if (unlikely(!get_rand(control, control->salt + 2, 6)))
return false; return false;