diff options
| author | Daniel Kahn Gillmor <[email protected]> | 2017-09-08 21:08:57 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-12-11 16:29:45 +0000 |
| commit | 0cf0f3aaf835d29848f1485df357606254ba6fad (patch) | |
| tree | efc66d33872ade944c09f40eced0582d66aff014 /agent/protect.c | |
| parent | dirmngr: Retry another server from the pool on 502, 503, 504. (diff) | |
| download | gnupg-0cf0f3aaf835d29848f1485df357606254ba6fad.tar.gz gnupg-0cf0f3aaf835d29848f1485df357606254ba6fad.zip | |
agent: compile-time configuration of s2k calibration.
* configure.ac: add --with-agent-s2k-calibration=MSEC, introduces
AGENT_S2K_CALIBRATION (measured in milliseconds)
* agent/protect.c (calibrate_s2k_count): Calibrate based on
AGENT_S2K_CALIBRATION.
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
GnuPG-bug-id: 3399
(cherry picked from commit 926d07c5fa05de05caef3a72b6fe156606ac0549)
Diffstat (limited to 'agent/protect.c')
| -rw-r--r-- | agent/protect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/agent/protect.c b/agent/protect.c index 7b5abf21b..16ae715e1 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -163,7 +163,7 @@ calibrate_s2k_count_one (unsigned long count) /* Measure the time we need to do the hash operations and deduce an - S2K count which requires about 100ms of time. */ + S2K count which requires roughly some targeted amount of time. */ static unsigned long calibrate_s2k_count (void) { @@ -175,11 +175,11 @@ calibrate_s2k_count (void) ms = calibrate_s2k_count_one (count); if (opt.verbose > 1) log_info ("S2K calibration: %lu -> %lums\n", count, ms); - if (ms > 100) + if (ms > AGENT_S2K_CALIBRATION) break; } - count = (unsigned long)(((double)count / ms) * 100); + count = (unsigned long)(((double)count / ms) * AGENT_S2K_CALIBRATION); count /= 1024; count *= 1024; if (count < 65536) |