diff options
| author | Werner Koch <[email protected]> | 2017-11-06 12:57:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-11-06 14:11:13 +0000 |
| commit | 78a6d0ce88ae14d8324fbab3aee3286b17e49259 (patch) | |
| tree | af30466ae0ed4def46b81b679a7a4e26c6d3569f /agent/protect.c | |
| parent | g10: Unattended key generation "Key-Grip" and "Subkey-Grip". (diff) | |
| download | gnupg-78a6d0ce88ae14d8324fbab3aee3286b17e49259.tar.gz gnupg-78a6d0ce88ae14d8324fbab3aee3286b17e49259.zip | |
agent: New option --s2k-count.
* agent/agent.h (opt): New field 's2k_count'.
* agent/gpg-agent.c (oS2KCount): New enum value.
(opts): New option --s2k-count.
(parse_rereadable_options): Set opt.s2k_count.
--
This option is useful to speed up the starting of gpg-agent and in
cases where the auto-calibration runs into problems due to a broken
time measurement facility.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit f7212f1d11aad5d910d2c77b2e5c6ab31a0e786e)
Diffstat (limited to 'agent/protect.c')
| -rw-r--r-- | agent/protect.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/agent/protect.c b/agent/protect.c index c257861e2..ab26220f5 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -198,6 +198,9 @@ get_standard_s2k_count (void) { static unsigned long count; + if (opt.s2k_count) + return opt.s2k_count < 65536 ? 65536 : opt.s2k_count; + if (!count) count = calibrate_s2k_count (); |