mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Added gpg-agent OPTION "s2k-count".
When unset or 0, the calibrated count will be used.
This commit is contained in:
parent
c9e473618f
commit
137e3a0fbc
8 changed files with 41 additions and 15 deletions
|
@ -181,6 +181,8 @@ struct server_control_s
|
|||
PKSIGN command to the scdaemon. */
|
||||
int in_passwd; /* Hack to inhibit enforced passphrase change
|
||||
during an explicit passwd command. */
|
||||
|
||||
unsigned long s2k_count; /* Other than the calibrated count. */
|
||||
};
|
||||
|
||||
|
||||
|
@ -332,7 +334,8 @@ gpg_error_t agent_protect_and_store (ctrl_t ctrl, gcry_sexp_t s_skey,
|
|||
unsigned long get_standard_s2k_count (void);
|
||||
unsigned char get_standard_s2k_count_rfc4880 (void);
|
||||
int agent_protect (const unsigned char *plainkey, const char *passphrase,
|
||||
unsigned char **result, size_t *resultlen);
|
||||
unsigned char **result, size_t *resultlen,
|
||||
unsigned long s2k_count);
|
||||
int agent_unprotect (const unsigned char *protectedkey, const char *passphrase,
|
||||
gnupg_isotime_t protected_at,
|
||||
unsigned char **result, size_t *resultlen);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue