diff options
| author | Ben Kibbey <bjk@luxsci.net> | 2011-06-29 02:35:13 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-06-29 13:17:25 +0200 |
| commit | 137e3a0fbcdc579b56860651a9b5554f9449ed1e (patch) | |
| tree | 26b354dda466de882f4c0bd50d576c67393f2f6a /agent/genkey.c | |
| parent | Fixed an URL typo in the FAQ. (diff) | |
| download | gnupg2-137e3a0fbcdc579b56860651a9b5554f9449ed1e.tar.xz gnupg2-137e3a0fbcdc579b56860651a9b5554f9449ed1e.zip | |
Added gpg-agent OPTION "s2k-count".
When unset or 0, the calibrated count will be used.
Diffstat (limited to 'agent/genkey.c')
| -rw-r--r-- | agent/genkey.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/agent/genkey.c b/agent/genkey.c index 79b99e6e5..e01a7bcb6 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -31,7 +31,8 @@ #include "sysutils.h" static int -store_key (gcry_sexp_t private, const char *passphrase, int force) +store_key (gcry_sexp_t private, const char *passphrase, int force, + unsigned long s2k_count) { int rc; unsigned char *buf; @@ -56,7 +57,7 @@ store_key (gcry_sexp_t private, const char *passphrase, int force) { unsigned char *p; - rc = agent_protect (buf, passphrase, &p, &len); + rc = agent_protect (buf, passphrase, &p, &len, s2k_count); if (rc) { xfree (buf); @@ -420,7 +421,7 @@ agent_genkey (ctrl_t ctrl, const char *cache_nonce, /* store the secret key */ if (DBG_CRYPTO) log_debug ("storing private key\n"); - rc = store_key (s_private, passphrase, 0); + rc = store_key (s_private, passphrase, 0, ctrl->s2k_count); if (!rc) { if (!cache_nonce) @@ -492,7 +493,8 @@ agent_protect_and_store (ctrl_t ctrl, gcry_sexp_t s_skey, if (passphrase_addr && *passphrase_addr) { /* Take an empty string as request not to protect the key. */ - err = store_key (s_skey, **passphrase_addr? *passphrase_addr:NULL, 1); + err = store_key (s_skey, **passphrase_addr? *passphrase_addr:NULL, 1, + ctrl->s2k_count); } else { @@ -507,7 +509,7 @@ agent_protect_and_store (ctrl_t ctrl, gcry_sexp_t s_skey, _("Please enter the new passphrase"), &pass); if (!err) - err = store_key (s_skey, pass, 1); + err = store_key (s_skey, pass, 1, ctrl->s2k_count); if (!err && passphrase_addr) *passphrase_addr = pass; else |